diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1fd4295 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "members-data"] + path = members-data + url = ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git + branch = master diff --git a/README.md b/README.md index cf182bc..3305af2 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,15 @@ Requirements : ### Install -1. Clone or fork this repo: `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git` -2. Clone or fork the private repo containing members data in the same folder that SiteWebAstrolabe_public : `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git` +1. Clone or fork this repo INCLUDING its submodule: `git clone --recurse-submodules ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git` 3. `cd` into the project directory (SiteWebAstrolabe_public) and run `npm install` 4. Once all the dependencies are installed run `npm start` 5. Open your browser at `http://localhost:8080` and away you go! +If you don't have the members data (page /equipe), you may have done a simple (non-recursive) clone. In this case, populate with member data by running `git submodule update --init --recursive`. Also, check that you do have the rights for the https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_private repository. + +If you need to get the latest commits of the SiteWebAstrolabe_private repo, you can do a `git submodule update --remote`. + ### Deploy 1. Copy paste deploy.js file in two new files `deploy-preprod.js`and `deploy-prod.js` diff --git a/members-data b/members-data new file mode 160000 index 0000000..68ef49b --- /dev/null +++ b/members-data @@ -0,0 +1 @@ +Subproject commit 68ef49b2a937ceabbd2e1bcfe89a190734481ae7 diff --git a/package.json b/package.json index 6734c15..5f8d787 100755 --- a/package.json +++ b/package.json @@ -52,13 +52,13 @@ }, "repository": { "type": "git", - "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe.git" + "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public.git" }, "keywords": [], "author": "Yves Gatesoupe", "license": "MIT", "bugs": { - "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe/issues" + "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public/issues" }, - "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe" + "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public" } diff --git a/src/images/profiles b/src/images/profiles index ef0cb46..d2aa226 120000 --- a/src/images/profiles +++ b/src/images/profiles @@ -1 +1 @@ -../../../SiteWebAstrolabe_private/profiles \ No newline at end of file +../../members-data/profiles/ \ No newline at end of file diff --git a/src/members b/src/members index 60d8641..c8200da 120000 --- a/src/members +++ b/src/members @@ -1 +1 @@ -../../SiteWebAstrolabe_private/members \ No newline at end of file +../members-data/members/ \ No newline at end of file diff --git a/src/pages/mentions-legales.md b/src/pages/mentions-legales.md index c9e2b1d..9a23682 100644 --- a/src/pages/mentions-legales.md +++ b/src/pages/mentions-legales.md @@ -48,7 +48,7 @@ https://www.6clones.fr/ __***Propriété Intellectuelle***__ -Le site et le code source de ce site sont librement réuilisable sous [licence MIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe/src/branch/master/LICENSE.txt) sauf les dossiers suivants et leur contenu : +Le site et le code source de ce site sont librement réuilisable sous [licence MIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public/src/branch/master/LICENSE.txt) sauf les dossiers suivants et leur contenu : * src/members * src/images/astrolabe diff --git a/src/posts/liberation-site-astro.md b/src/posts/liberation-site-astro.md index b651c09..39d1632 100644 --- a/src/posts/liberation-site-astro.md +++ b/src/posts/liberation-site-astro.md @@ -23,7 +23,7 @@ Nous souhaitons donc mettre à disposition notre site pour une réutilisation et N'hésitez donc pas à réutiliser notre code, et si c'est le cas nous apprécierions que vous nous le disiez via notre [formulaire de contact](#contact-form) -Pour obtenir le code de notre site, vous pouvez le récupérer via notre [repo GIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe). +Pour obtenir le code de notre site, vous pouvez le récupérer via notre [repo GIT](https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public).

diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss index 3006d34..e88c333 100644 --- a/src/scss/_theme.scss +++ b/src/scss/_theme.scss @@ -82,6 +82,10 @@ a:not([class]):visited { margin-left: 1rem; } +.box-flex { + display: flex; +} + .align-center { align-items: center; }