diff --git a/nodemon.json b/nodemon.json
new file mode 100644
index 0000000..f44c2de
--- /dev/null
+++ b/nodemon.json
@@ -0,0 +1,4 @@
+{
+ "verbose": false,
+ "ignore": ["views", "static"]
+}
\ No newline at end of file
diff --git a/presentation.md b/presentation.md
new file mode 100644
index 0000000..2a434f2
--- /dev/null
+++ b/presentation.md
@@ -0,0 +1 @@
+Potremmo impermutabile e lui carissime ignoranza, della nome noi sempre a prieghi in beato per. Noia quale lodato nella raccontare novella che. Nel dare modo in liberalita piaceri, alla impetrata il di e la novella manifestamente siamo, che che quali.
\ No newline at end of file
diff --git a/src/app.ts b/src/app.ts
index 87619ed..35d17ac 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -12,6 +12,7 @@ import AdminAuthMiddleware from './middlewares/AdminAuthMiddleware'
import DelegateAuthMiddleware from './middlewares/DelegateAuthMiddleware'
import PublicController from './controllers/PublicController'
import cors from 'cors'
+import twig from 'twig'
dotenv.config({
path: __dirname + '/../.env'
@@ -21,6 +22,8 @@ const app: express.Application = express()
const host: string = "0.0.0.0"
const port: number = 8001
+twig.cache(false)
+
let main = async () => {
mongoose.connection.on('error', err => {
console.error(err)
@@ -36,6 +39,10 @@ let main = async () => {
console.log('> Connected to mongodb')
})
+ app.set("twig options", {
+ allow_async: true,
+ strict_variables: false
+ })
app.use(cors())
app.use(bodyParser.json())
@@ -46,6 +53,8 @@ let main = async () => {
app.get('/', PublicController.home)
app.get('/association/:slug', PublicController.organization)
+ app.get('/a-propos', PublicController.about)
+ app.get('/mentions-legales', PublicController.legals)
app.get('/icon/:id', DefaultController.viewIcon)
app.get('/email', DefaultController.sendEmail)
@@ -79,6 +88,8 @@ let main = async () => {
.put('/', DelegateController.update)
.post('/submit', DelegateController.submit)
.post('/thumbnail', DelegateController.uploadThumbnail())
+ .post('/cover', DelegateController.uploadCover())
+ .post('/medias', DelegateController.uploadMedias())
.delete('/', DelegateController.destroy)
)
@@ -92,7 +103,7 @@ let main = async () => {
*/
app.post('/api/media', MediaController.uploadRoute())
- app.delete('/api/media/:key', MediaController.delete)
+ //app.delete('/api/media/:key', MediaController.delete)
app.use(express.static('/apps/forum_server/static'))
diff --git a/src/controllers/AdminOrganizationController.ts b/src/controllers/AdminOrganizationController.ts
index 5d0d0b4..8ad2edc 100644
--- a/src/controllers/AdminOrganizationController.ts
+++ b/src/controllers/AdminOrganizationController.ts
@@ -4,6 +4,7 @@ import cryptoRandomString from 'crypto-random-string'
import EmailService from '../EmailService'
import slugify from 'slugify'
import { Document } from 'mongoose'
+import MediaService from '../MediaService'
export default class AdminOrganizationController {
static getMany(req: express.Request, res: express.Response) {
@@ -22,22 +23,22 @@ export default class AdminOrganizationController {
let body: any = {
token: AdminOrganizationController.generateToken(),
createdAt: new Date(),
- slug: req.body.adminName === undefined ? undefined : slugify(req.body.adminName).toLowerCase(),
- ...req.body
- // ...{
- // proposedVersion: {
- // name: '',
- // descriptionShort: '',
- // descriptionLong: '',
- // contacts: [],
- // schedule: [],
- // pricing: [],
- // tag: null,
- // cover: null,
- // gallery: [],
- // thumbnail: null
- // }
- // }
+ slug: slugify(req.body.adminName).toLowerCase(),
+ ...req.body,
+ ...{
+ proposedVersion: {
+ name: req.body.adminName
+ // descriptionShort: '',
+ // descriptionLong: '',
+ // contacts: [],
+ // schedule: [],
+ // pricing: [],
+ // tag: null,
+ // cover: null,
+ // gallery: [],
+ // thumbnail: null
+ }
+ }
}
Organization.create(body).then(data => {
AdminOrganizationController.sendEmailTokenUniversal(data)
@@ -75,16 +76,46 @@ export default class AdminOrganizationController {
}
static destroy(req: express.Request, res: express.Response) {
- Organization.deleteOne({ _id: req.params.id }).then(data => {
- let isSuccess = data.deletedCount !== undefined && data.deletedCount > 0
- res.status(isSuccess ? 200 : 400).json({
- success: isSuccess,
- data
- })
- }).catch(err => res.status(400).json({
- success: false,
- errors: err.errors
- }))
+ Organization.findById(req.params.id).then(organization => {
+ Organization.deleteOne({ _id: req.params.id }).then(data => {
+ if (organization === null) {
+ return
+ }
+ // delete all media from this organization
+ let keys: string[] = []
+ const proposedVersion: any = organization.get('proposedVersion')
+ if (proposedVersion.thumbnail !== undefined && proposedVersion.thumbnail !== null) {
+ keys.push(proposedVersion.thumbnail.key)
+ }
+ if (proposedVersion.cover !== undefined && proposedVersion.cover !== null) {
+ keys.push(proposedVersion.cover.key)
+ }
+ console.log(proposedVersion.gallery)
+ if (Array.isArray(proposedVersion.gallery)) {
+ keys = keys.concat(proposedVersion.gallery.map((m: any) => m.key))
+ }
+
+ keys.forEach((key: string) => {
+ if (key === undefined || key === null || key.length <= 2) { return }
+ console.log('> OrganizationDestroyMediaCleanup: Deleted ' + key)
+ MediaService.getS3().deleteObject({
+ Bucket: MediaService.getBucket(),
+ Key: key
+ }, (err, _) => {
+ if (err !== null) {
+ console.error('> OrganizationDestroyMediaCleanup: Cannot delete a media from a organization which will be deleted')
+ console.log(err, err.stack)
+ }
+ })
+ })
+
+ let isSuccess = data.deletedCount !== undefined && data.deletedCount > 0
+ res.status(isSuccess ? 200 : 400).json({
+ success: isSuccess,
+ data
+ })
+ }).catch(err => res.status(400).json({ success: false, errors: err.errors }))
+ }).catch(err => res.status(400).json({ success: false, errors: err }))
}
static sendEmailToken(req: express.Request, res: express.Response) {
@@ -150,11 +181,16 @@ export default class AdminOrganizationController {
}
static sendEmailTokenUniversal(data: Document) {
+ const baseUrl = process.env.WEB_UI_URL === undefined ? "URL_NOT_FOUND" : process.env.WEB_UI_URL
EmailService.send(
data.get('email'),
"Votre lien secret pour modifier votre association",
"token",
- { adminName: data.get('adminName'), token: data.get('token') }
+ {
+ adminName: data.get('adminName'),
+ token: data.get('token'),
+ link: baseUrl + '/delegate?delegateToken=' + data.get('token')
+ }
).then(() => {
console.log('> A token email was sent')
}).catch(() => {
diff --git a/src/controllers/DelegateController.ts b/src/controllers/DelegateController.ts
index 475aea3..b2a54cd 100644
--- a/src/controllers/DelegateController.ts
+++ b/src/controllers/DelegateController.ts
@@ -1,3 +1,4 @@
+import Tag from '../models/Tag'
import Organization from '../models/Organization'
import * as express from 'express'
import EmailService from '../EmailService'
@@ -9,7 +10,15 @@ import slugify from 'slugify'
export default class DelegateController {
static get(req: express.Request, res: express.Response) {
- res.json({ success: true, data: res.locals.organization })
+ Tag.find().then(tags => {
+ res.json({
+ success: true,
+ data: {
+ organization: res.locals.organization,
+ tags
+ }
+ })
+ })
}
static test(req: express.Request, res: express.Response) {
@@ -17,28 +26,92 @@ export default class DelegateController {
}
static update(req: express.Request, res: express.Response) {
- if (res.locals.organization.validationState === 'pending') {
+ const organization: any = res.locals.organization
+ if (organization.validationState === 'pending') {
return res.json({
success: false,
errors: [{ code: 'update-forbidden', message: 'Organization cannot be updated while the validationState is set to "pending"' }]
})
}
- // only update proposedVersion
- Organization.updateOne({ _id: res.locals.organization._id }, {
- proposedVersion: req.body,
- updatedAt: new Date()
- }).then(data => {
- res.json({
- success: true,
- data,
- body: req.body
+
+ const next = (tag: any) => {
+ // only update proposedVersion
+ let proposedVersion: any = req.body
+ proposedVersion.tag = tag
+ proposedVersion.descriptionLong = proposedVersion.descriptionLong.replace(/\n/g, '')
+
+ // validate contact.address
+ // validate all fields to not overflow
+ // validate the size of all the json, all the data recorded
+
+ // manage medias
+ // delete media that are not used
+ if (!Array.isArray(proposedVersion.gallery)) {
+ proposedVersion.gallery = []
+ }
+ if (Array.isArray(organization.proposedVersion.gallery)) {
+ organization.proposedVersion.gallery.forEach((media: any) => {
+ // if a existing media is not in the new version we delete it
+ if (proposedVersion.gallery.filter((m: any) => m.key === media.key).length === 0) {
+ console.log('> Old media cleanup: we must delete ', media)
+ MediaService.getS3().deleteObject({
+ Bucket: MediaService.getBucket(),
+ Key: media.key
+ }, (err, _) => {
+ if (err !== null) {
+ console.error('> Cannot delete a old media element')
+ console.log(err, err.stack)
+ }
+ })
+ }
+ })
+ }
+
+ // format schedule, pricing
+ if (!Array.isArray(proposedVersion.schedule)) {
+ proposedVersion.schedule = []
+ }
+ if (!Array.isArray(proposedVersion.pricing)) {
+ proposedVersion.pricing = []
+ }
+
+ Organization.updateOne({ _id: organization._id }, {
+ proposedVersion,
+ updatedAt: new Date()
+ }).then(data => {
+ res.json({
+ success: true,
+ data,
+ body: req.body
+ })
+ }).catch(err => {
+ res.status(400).json({
+ success: false,
+ errors: err.errors !== undefined ? err.errors : err
+ })
})
- }).catch(err => {
- res.status(400).json({
- success: false,
- errors: err.errors !== undefined ? err.errors : err
- })
- })
+ }
+
+ if (req.body.tag !== undefined && req.body.tag !== null && req.body.tag.length > 2) {
+ // skip the tag part if the tag didn't changed
+ if (
+ organization.proposedVersion.tag === undefined ||
+ organization.proposedVersion.tag === null ||
+ req.body.tag !== organization.proposedVersion.tag._id
+ ) {
+ // if the tag is defined, search the tag id
+ Tag.findById(req.body.tag).then(tag => {
+ next(tag)
+ }).catch(err => {
+ console.log(err)
+ res.status(400).json({ success: false, errors: err, _note: 'The tag id provided is invalid' })
+ })
+ } else {
+ next(organization.tag)
+ }
+ } else {
+ next(null)
+ }
}
static submit(req: express.Request, res: express.Response) {
@@ -78,7 +151,6 @@ export default class DelegateController {
}
static uploadThumbnail(): express.RequestHandler[] {
- // we upload the thumbnail
return [
multer({
storage: multerS3({
@@ -88,14 +160,14 @@ export default class DelegateController {
contentType: multerS3.AUTO_CONTENT_TYPE,
key: (_: any, file: any, cb: any) => {
console.log(file)
- cb(null, Date.now().toString() + '_' + slugify(file.originalname))
+ cb(null, Date.now().toString() + '_thumbnail')
}
})
}).single('file'),
(req: express.Request, res: express.Response) => {
// if the current thumbnail is defined AND the published thumnbnail is defined AND the current thumbnail is different from the published one
// THEN we delete the current thumbnail
- const proposedVersion: any = res.locals.organization.proposedVersion
+ let proposedVersion: any = res.locals.organization.proposedVersion
const publishedVersion: any = res.locals.organization.publishedVersion
if (
proposedVersion !== undefined && proposedVersion !== null &&
@@ -109,7 +181,7 @@ export default class DelegateController {
Bucket: MediaService.getBucket(),
Key: proposedVersion.thumbnail.key
}, (err, _) => {
- if (err !== null) {
+ if (err !== null) {
console.error('> Cannot delete a old thumbnail')
console.log(err, err.stack)
}
@@ -122,13 +194,134 @@ export default class DelegateController {
contentType: req.file.contentType,
// @ts-ignore
location: req.file.location,
+ // @ts-ignore
+ size: req.file.size,
+ // @ts-ignore
+ originalFileName: req.file.originalname,
type: 'thumbnail'
}
+ proposedVersion = { ...res.locals.organization.proposedVersion, thumbnail }
Organization.updateOne({ _id: res.locals.organization._id }, {
- proposedVersion: { thumbnail },
+ proposedVersion,
updatedAt: new Date()
}).then(data => {
- res.json({ success: true, data, thumbnail })
+ res.json({ success: true, data, thumbnail, proposedVersion })
+ }).catch(err => {
+ res.status(400).json({
+ success: false,
+ errors: err.errors !== undefined ? err.errors : err
+ })
+ })
+ }
+ ]
+ }
+
+ static uploadCover(): express.RequestHandler[] {
+ return [
+ multer({
+ storage: multerS3({
+ s3: MediaService.getS3(),
+ bucket: 'development-bucket',
+ acl: 'public-read',
+ contentType: multerS3.AUTO_CONTENT_TYPE,
+ key: (_: any, file: any, cb: any) => {
+ console.log(file)
+ cb(null, Date.now().toString() + '_cover')
+ }
+ })
+ }).single('file'),
+ (req: express.Request, res: express.Response) => {
+ // if the current thumbnail is defined AND the published thumnbnail is defined AND the current thumbnail is different from the published one
+ // THEN we delete the current thumbnail
+ let proposedVersion: any = res.locals.organization.proposedVersion
+ const publishedVersion: any = res.locals.organization.publishedVersion
+ if (
+ proposedVersion !== undefined && proposedVersion !== null &&
+ proposedVersion.cover !== undefined && proposedVersion.cover !== null &&
+ publishedVersion !== undefined && publishedVersion !== null &&
+ publishedVersion.cover !== undefined && publishedVersion.cover !== null &&
+ publishedVersion.cover.location !== proposedVersion.cover.location
+ ) {
+ console.log(' we must delete ', proposedVersion.cover)
+ MediaService.getS3().deleteObject({
+ Bucket: MediaService.getBucket(),
+ Key: proposedVersion.cover.key
+ }, (err, _) => {
+ if (err !== null) {
+ console.error('> Cannot delete a old cover')
+ console.log(err, err.stack)
+ }
+ })
+ }
+ const cover: any = {
+ // @ts-ignore
+ key: req.file.key,
+ // @ts-ignore
+ contentType: req.file.contentType,
+ // @ts-ignore
+ location: req.file.location,
+ // @ts-ignore
+ size: req.file.size,
+ // @ts-ignore
+ originalFileName: req.file.originalname,
+ type: 'cover'
+ }
+ proposedVersion = { ...res.locals.organization.proposedVersion, cover }
+ Organization.updateOne({ _id: res.locals.organization._id }, {
+ proposedVersion,
+ updatedAt: new Date()
+ }).then(data => {
+ res.json({ success: true, data, cover, proposedVersion })
+ }).catch(err => {
+ res.status(400).json({
+ success: false,
+ errors: err.errors !== undefined ? err.errors : err
+ })
+ })
+ }
+ ]
+ }
+
+ static uploadMedias(): express.RequestHandler[] {
+ return [
+ multer({
+ storage: multerS3({
+ s3: MediaService.getS3(),
+ bucket: 'development-bucket',
+ acl: 'public-read',
+ contentType: multerS3.AUTO_CONTENT_TYPE,
+ key: (_: any, file: any, cb: any) => {
+ console.log(file)
+ cb(null, Date.now().toString() + '_media')
+ }
+ })
+ }).array('file'),
+ (req: express.Request, res: express.Response) => {
+ let proposedVersion: any = res.locals.organization.proposedVersion
+
+ // @ts-ignore
+ req.files.forEach((file: any) => {
+ proposedVersion.gallery.push({
+ key: file.key,
+ contentType: file.contentType,
+ location: file.location,
+ size: file.size,
+ type: 'image',
+ originalFileName: file.originalname
+ })
+ })
+
+ Organization.updateOne({ _id: res.locals.organization._id }, {
+ proposedVersion,
+ updatedAt: new Date()
+ }).then(result => {
+ res.json({
+ success: true,
+ data: {
+ result,
+ gallery: proposedVersion.gallery
+ }
+ })
}).catch(err => {
res.status(400).json({
success: false,
diff --git a/src/controllers/MediaController.ts b/src/controllers/MediaController.ts
index c651baa..8eff1c2 100644
--- a/src/controllers/MediaController.ts
+++ b/src/controllers/MediaController.ts
@@ -16,7 +16,7 @@ export default class MediaController {
contentType: multerS3.AUTO_CONTENT_TYPE,
key: (_: any, file: any, cb: any) => {
console.log(file)
- cb(null, Date.now().toString() + '_' + slugify(file.originalname)) //use Date.now() for unique file keys
+ cb(null, Date.now().toString()) //use Date.now() for unique file keys
}
})
}).single('file'),
@@ -25,9 +25,6 @@ export default class MediaController {
}
static upload(req: express.Request, res: express.Response) {
-
-
-
res.json({
success: true,
data: { file: req.file }
diff --git a/src/controllers/PublicController.ts b/src/controllers/PublicController.ts
index 273f712..64b5a9b 100644
--- a/src/controllers/PublicController.ts
+++ b/src/controllers/PublicController.ts
@@ -7,24 +7,78 @@ import Mustache from 'mustache'
import fs from 'fs'
import { IconService, IconInterface } from '../IconService'
import IORedis from 'ioredis'
+import Tag from '../models/Tag'
export default class PublicController {
-
static async home(req: express.Request, res: express.Response) {
// let client: IORedis.Redis = RedisService.getClient()
// await client.set('hello', 'world')
// res.json({
// data: await client.get('hello')
// })
- res.render('home.twig', {
- message : "Hello World"
+ Tag.find().then(tags => {
+ Organization.find().then(organizations => {
+ res.render('home.twig', {
+ tags,
+ tagsJSON: JSON.stringify(tags),
+ organizationsJSON: JSON.stringify(organizations.map(o => {
+ const version = o.get('proposedVersion')
+ return {
+ name: version.name,
+ description: version.descriptionShort,
+ thumbnail: version.thumbnail.location,
+ tag: version.tag._id,
+ slug: o.get('slug')
+ }
+ }))
+ })
+ })
})
}
static async organization(req: express.Request, res: express.Response) {
- res.render('index.twig', {
- message : "Hello World"
- })
+ Organization.find({ slug: req.params.slug }).then(data => {
+ if (data.length === 0) {
+ res.status(404).render('not-found.twig')
+ } else {
+ const version = data[0].get('proposedVersion')
+ if (version.contacts !== null && version.contacts !== undefined) {
+ if (typeof version.contacts.address === 'string') {
+ version.contacts.address = version.contacts.address.split('\n')
+ }
+ if (typeof version.contacts.phone === 'string') {
+ let phone = version.contacts.phone
+ if (phone.indexOf('+33') === 0) {
+ phone = '0' + phone.substr(3)
+ }
+ let phoneSplit = ''
+ let partEnd = false
+ for (var i = 0; i < phone.length; i++) {
+ phoneSplit += phone.charAt(i)
+ if (partEnd === true) {
+ phoneSplit += ' '
+ }
+ partEnd = !partEnd
+ }
+ version.contacts.phoneInt = "+33" + phone.substr(1)
+ version.contacts.phoneSplit = phoneSplit
+ }
+ }
+ console.log(version)
+ res.render('organization.twig', {
+ layout: 'standalone',
+ data: version
+ })
+ }
+ }).catch(_ => res.status(404).render('not-found.twig'))
+ }
+
+ static async about(req: express.Request, res: express.Response) {
+ res.render('about.twig')
+ }
+
+ static async legals(req: express.Request, res: express.Response) {
+ res.render('legals.twig')
}
}
\ No newline at end of file
diff --git a/src/models/Organization.ts b/src/models/Organization.ts
index 0cd41e5..4e99abb 100644
--- a/src/models/Organization.ts
+++ b/src/models/Organization.ts
@@ -29,11 +29,6 @@ class AllowedString extends mongoose.SchemaType {
// @ts-ignore
mongoose.Schema.Types['AllowedString'] = AllowedString
-const ScheduleIntervalBoundary = {
- hour: { type: Number },
- minute: { type: Number }
-}
-
const Media = {
location: { type: String },
type: {
@@ -41,8 +36,10 @@ const Media = {
name: 'MediaType',
allowedValues: ['cover', 'thumbnail', 'video', 'image']
},
+ originalFileName: { type: String },
key: { type: String },
- contentType: { type: String }
+ contentType: { type: String },
+ size: { type: Number } // size of the file in bytes
}
const OrganizationVersion = {
@@ -68,8 +65,8 @@ const OrganizationVersion = {
description: { type: String },
when: [{
day: { type: String }, // (Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche)
- from: ScheduleIntervalBoundary,
- to: ScheduleIntervalBoundary
+ from: { type: String },
+ to: { type: String }
}]
}],
pricing: [{
diff --git a/static/about.html b/static/about.html
deleted file mode 100644
index 81b2855..0000000
--- a/static/about.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Home
-
-
-
Lorem, ipsum dolor sit amet consectetur adipisicing elit. Autem alias sapiente neque? Dignissimos harum blanditiis fugiat eius alias nam repudiandae, et explicabo nihil eos, quos reprehenderit nobis aperiam quibusdam ad?
-
-
+ `
titleContainer.appendChild(icon)
upperContent.appendChild(titleContainer)
let description = createEl('card-description')
- description.textContent = organization.descriptionShort
+ description.textContent = organization.description
upperContent.appendChild(description)
let link = createEl('card-link')
@@ -109,6 +128,10 @@ function renderCard(organization) {
content.appendChild(upperContent)
content.appendChild(link)
card.appendChild(content)
+
+ card.onclick = () => {
+ window.location = aTag.href
+ }
return card
}
@@ -129,7 +152,7 @@ function enableTag(node) {
if (!all) {
tagId = node.attributes['data-tag-id'].value
}
- let data = organizations.filter(orga => orga.tag.id === tagId || all)
+ let data = organizations.filter(orga => orga.tag._id === tagId || all)
let cards = renderMosaic(data)
if (currentCardContainer !== null) {
mosaic.removeChild(currentCardContainer)
diff --git a/static/assets/main.css b/static/assets/main.css
index 8038f15..6312487 100644
--- a/static/assets/main.css
+++ b/static/assets/main.css
@@ -8,7 +8,7 @@ body {
}
.container {
- width: 80%;
+ width: 60%;
margin: 0 auto;
}
@@ -23,8 +23,21 @@ a:hover {
color: #2980b9;
}
+
+@media (max-width: 1600px) {
+ .container {
+ width: 70%;
+ }
+}
+
+@media (max-width: 1500px) {
+ .container {
+ width: 80%;
+ }
+}
+
@media (max-width: 900px) {
.container {
width: 92%;
}
-}
\ No newline at end of file
+}
diff --git a/static/assets/organization.css b/static/assets/organization.css
index 8420c56..982469a 100644
--- a/static/assets/organization.css
+++ b/static/assets/organization.css
@@ -23,13 +23,19 @@
color: #34495e;
cursor: pointer;
transition: all .2s;
+ text-decoration: none;
}
.return-icon {
- font-size: 1.5em;
+ display: flex;
+ align-items: center;
margin-right: .5em;
}
+.return-icon svg {
+ width: 1.3em;
+}
+
.return:hover {
opacity: 0.88;
text-decoration: underline;
@@ -140,7 +146,7 @@
transform: scale(1.2);
}
-.media-main {
+.media-container:first-of-type {
grid-row: 1 / span 2;
}
@@ -207,10 +213,29 @@ section {
margin-bottom: .5em;
}
+.description p {
+ margin-top: .75em;
+}
.description p:last-child {
margin-bottom: 0;
}
+.description h3 {
+ font-size: 1.4em;
+ margin-top: 1em;
+ margin-bottom: 0;
+}
+
+.description h4 {
+ font-size: 1.2em;
+ margin-top: 1em;
+ margin-bottom: 0;
+}
+
+.description h3, .description h4 {
+ opacity: 0.8;
+}
+
/* *****************************************************************************
* SCHEDULE
@@ -237,7 +262,7 @@ section {
.schedule-category-collapse-icon {
color: #B12008;
- font-size: 1.5em;
+ width: 1.5em;
transition: all 0.1s ease-out;
}
@@ -251,7 +276,6 @@ section {
.schedule-category-days-container {
border-radius: 4px;
background-color: #ECF0F1;
- width: 40;
margin-left: 2em;
margin-top: 1em;
@@ -283,14 +307,14 @@ section {
.pricing {
display: flex;
- justify-content: space-between;
+ justify-content: center;
}
.pricing-card {
+ max-width: 14em;
height: 10em;
width: 100%;
- padding-top: 1.5em;
- padding-bottom: 1.5em;
+ padding: 1.5em 1em;
text-align: center;
border-radius: 4px;
display: flex;
@@ -360,6 +384,10 @@ section {
font-size: 1.5em;
}
+.contact-icon svg {
+ width: .7em;
+}
+
.contact-content {
text-align: right;
}
@@ -369,21 +397,45 @@ section {
font-weight: bold;
}
+.external-link {
+ width: .8em;
+}
+
+.email .contact-icon svg {
+ width: .9em;
+}
+
+.website .contact-icon svg {
+ width: .9em;
+}
+
.facebook .contact-icon {
background-color: #3B5999;
color: white;
}
+.facebook .contact-icon svg {
+ width: .5em;
+}
+
.instagram .contact-icon {
background:linear-gradient(45deg, #405de6, #5851db, #833ab4, #c13584, #e1306c, #fd1d1d);
color: white;
}
+.instagram .contact-icon svg {
+ width: .75em;
+}
+
.twitter .contact-icon {
background-color: #1DA1F2;
color: white;
}
+.twitter .contact-icon svg {
+ width: .75em;
+}
+
/* *****************************************************************************
* FOOTER
@@ -412,6 +464,13 @@ section {
}
+@media (max-width: 1200px) {
+ .schedule-category-days-container {
+ margin-right: 25em;
+ }
+}
+
+
@media (max-width: 900px) {
.cover-background {
@@ -446,23 +505,40 @@ section {
grid-template-columns: .5fr .5fr;
grid-template-rows: 1fr .5fr .5fr;
}
- .media-main {
+
+ .media-container:first-of-type {
grid-row: 1 / span 1;
grid-column: 1 / span 2;
}
+ .schedule-category-header {
+ padding-left: 1em;
+ padding-right: 1em;
+ }
+
.schedule-category-days-container {
margin-right: 5em;
}
- .pricing-card {
- margin-right: .5em;
+ .pricing {
+ flex-direction: column;
+ align-items: center;
}
+ .pricing-card {
+ margin-right: 0;
+ margin-bottom: 1em;
+ }
+
.contact {
width: 100%;
}
+ .contact-icon {
+ width: 1.5em;
+ height: 1.5em;
+ }
+
.contact-item {
padding-left: 1em;
padding-right: 1em;
@@ -470,5 +546,21 @@ section {
.contact-content {
word-break: break-all;
+ font-size: .9em;
+ }
+
+ .facebook .contact-content, .twitter .contact-content, .website .contact-content, .instagram .contact-content {
+ font-size: .8em;
+ }
+}
+
+@media (max-width: 600px) {
+ .schedule-category-days-container {
+ margin-right: 1em;
+ padding-left: 1em;
+ padding-right: 1em;
+ }
+ .return-title {
+ display: none;
}
}
\ No newline at end of file
diff --git a/static/fa_icons b/static/fa_icons
deleted file mode 120000
index ccdb5bc..0000000
--- a/static/fa_icons
+++ /dev/null
@@ -1 +0,0 @@
-/home/mbess/font_awesome_icons/
\ No newline at end of file
diff --git a/static/home.html b/static/home.html
deleted file mode 100644
index cd25905..0000000
--- a/static/home.html
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
- Home
-
-
-
-
-
-
-
-
- Afficher le menu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Culturelles
-
-
-
-
-
-
-
-
-
-
- Danse et musique
-
-
-
-
-
-
-
-
-
-
Association
-
-
-
-
-
-
-
- We Robot
-
-
- Association de robotique
-
-
-
-
-
-
-
-
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Officia minima aliquam corporis fugit repellat obcaecati consequatur cumque, dolore omnis et porro, sit iusto similique blanditiis vel, alias quam ducimus voluptates.
-
-
- Unde neque adipisci et. Consequatur labore similique quia. Rerum nihil eius assumenda quae. Non vel sapiente omnis. Eum explicabo neque maxime sapiente et perspiciatis et.
-
-
- Delectus unde inventore similique ut quo. Consequatur assumenda quaerat aliquid velit et corrupti. Laboriosam qui magnam culpa est amet nobis tenetur. Ducimus a sint ea. Expedita omnis libero ipsum dolor ipsam dolor beatae.
-
-
- Qui vel sit expedita eum recusandae nemo. Facere quas dolor eum ut. Aut omnis et qui repellat nihil accusantium. Et vitae beatae ratione. Tenetur sit omnis sa
-
-
-
-
-
-
-
-
-
-
-
- Lundi
-
-
- 17:00 - 18:00
-
-
-
-
- Mardi
-
-
- 14:00 - 15:00
-
-
-
-
- Samedi
-
-
- 16:00 - 17:00
-
-
-
-
-
-
-
-
-
-
-
- Lundi
-
-
- 17:00 - 18:00
-
-
-
-
- Mardi
-
-
- 14:00 - 15:00
-
-
-
-
- Samedi
-
-
- 16:00 - 17:00
-
-
-
-
-
-
-
-
-
-
-
- 12 €
-
-
- Enfants
-
-
- Facere quas dolor eum ut.
-
-
-
-
- 12 €
-
-
- Enfants
-
-
- Facere quas dolor eum ut.
-
-
-
-
- 12 €
-
-
- Enfants
-
-
- Facere quas dolor eum ut.
-
-
-
-
-
-
-
+
+ Lorem, ipsum dolor sit amet consectetur adipisicing elit. Autem alias sapiente neque? Dignissimos harum blanditiis fugiat eius alias nam repudiandae, et explicabo nihil eos, quos reprehenderit nobis aperiam quibusdam ad?
+
+
+ Takimata dolores sanctus lorem dolor labore dolores lorem voluptua diam ipsum, at accusam sed tempor accusam ea clita et tempor. Duo kasd eirmod at amet sed sed sanctus sit, sed kasd eos dolore amet diam nonumy est ipsum diam, lorem tempor dolore sed tempor sed eos justo no amet. Est.Lorem, ipsum dolor sit amet consectetur adipisicing elit. Autem alias sapiente neque? Dignissimos harum blanditiis fugiat eius alias nam repudiandae, et explicabo nihil eos, quos reprehenderit nobis aperiam quibusdam ad?
+
+
+ Lorem, ipsum dolor sit amet consectetur adipisicing elit. Autem alias sapiente neque? Dignissimos harum blanditiis fugiat eius alias nam repudiandae, et explicabo nihil eos, quos reprehenderit nobis aperiam quibusdam ad?
+
+
{% block title %}{% endblock %} - Forum des associations 2020
+ {% block title %}{% endblock %} | Forum des associations 2020
+
+ {% block content %}{% endblock %}
- {% block script %}{% endblock %}
+ {% if layout is not defined %}
+
+
+
+ {% block content %}{% endblock %}
+
+
+Pour rappel, vous pouvez utiliser ce lien pour vous connecter sur votre interface : {{ link }}
+
+
Coordialement
diff --git a/views/emails/token.twig b/views/emails/token.twig
index 4072109..0b5453c 100644
--- a/views/emails/token.twig
+++ b/views/emails/token.twig
@@ -4,7 +4,9 @@
Ceci est un email automatique afin de communiquer le lien au gérant de l'association nommée "{{ adminName }}" dans le but de modifier les informations concernant cette association sur la platforme de espace condorcet.
-{{ link }}
+
+Vous pouvez utilisez ce lien pour vous connecter sur l'interface web permettant de modifier votre association sur la platforme : {{ link }}
+
Voici votre clée: {{ token }}
diff --git a/views/home.twig b/views/home.twig
index 31cd237..319ee80 100644
--- a/views/home.twig
+++ b/views/home.twig
@@ -1,13 +1,97 @@
{% extends "./base.twig" %}
-{% block title %}Index{% endblock %}
-{% block head %}
-
-{% endblock %}
+{% block title %}Accueil{% endblock %}
+{% block head %}{% endblock %}
{% block content %}
- Index
-
- Welcome on my awesome homepage.
-
+
+
+
+
+
+
+ Afficher le menu
+
+
+
+
+
+
+
+
+
+ {% for tag in tags %}
+
+ {% endfor %}
+
+
+
Informations légales
+
+
Siège social
+
+
+ Espace Condorcet Centre Social
+
+
Contact
+
+
+ Téléphone : 02 32 77 50 80
+
+
Représentant légal
+
+
Liliane COQUET
+
+
+
Immatriculation
+
+
+ Numéro SIREN : 338 248 206 000 25
+
+
Hébergement
+
+
+ Scaleway
+
+
Page introuvable
+
+{% endblock %}
diff --git a/views/organization.html b/views/organization.html
deleted file mode 100644
index e69de29..0000000
diff --git a/views/organization.twig b/views/organization.twig
new file mode 100644
index 0000000..35e2ed4
--- /dev/null
+++ b/views/organization.twig
@@ -0,0 +1,272 @@
+{% extends "./base.twig" %}
+{% block title %}Association{% endblock %}
+{% block head %}
+
+
+
+
+
+
+
+ {{ data.name }}
+
+
+
+
+
+
+
+
+
+ {% if data.descriptionLong|length > 0 %}
+
+
+
+ {{ data.descriptionLong|raw }}
+
+
+ {% endif %}
+
+ {% if data.schedule|length > 0 %}
+
+
+
+ {% for item in data.schedule %}
+
+
+
+
+ {% for when in item.when %}
+
+
+ {{ when.day }}
+
+
+ {{ when.from }} - {{ when.to }}
+
+
+ {% endfor %}
+
+
+
+ {% endfor %}
+
+ {% endif %}
+
+ {% if data.pricing|length > 0 %}
+
+
+
+ {% for item in data.pricing %}
+
+
+ {{ item.priceLabel }}
+
+
+ {{ item.name }}
+
+
+ {{ item.description }}
+
+
+ {% endfor %}
+
+ {% endif %}
+
+ {% if data.contacts is defined %}
+
+ {% endif %}
+
- 