Skip to content

Commit

Permalink
Merge pull request #2 from scout-ch/feature/restructure-for-it-compass
Browse files Browse the repository at this point in the history 
Feature/restructure for it compass
  • Loading branch information
@ewangler
ewangler authored Oct 14, 2024
2 parents efb533b + f73898e commit 7d0c9b2
Show file tree
Hide file tree
Showing 20 changed files with 1,514 additions and 136 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version: 16.x
- run: yarn install
- run: yarn build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: build-cache
path: ./build
Expand All @@ -32,11 +32,11 @@ jobs:
if: github.ref == 'refs/heads/main'

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: build-cache
path: ./build
- uses: peaceiris/actions-gh-pages@v3
- uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build
38 changes: 21 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,24 @@ It correctly bundles React in production mode and optimizes the build for the be
The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `yarn eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).
----
Datengrundlage für die Fragen:



| Questions | | | | | | | | | | | | |
|---------------|----|---------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|--------------------|-----------------------------------|------------------------------------------------|------------------------------|-----------------------------------|------------------------------------------------|-----------------------------------|------------------------------------------------|------------------------------------------------|
| key | | Frage | App | Game | Youtube kanal video platform | eLearning | Website | Podcast | office (formular) | PDF | PM Tool (z. B. Trello) | kollaborative Plattformen |
| printable | 1 | Muss es gedruckt funktionieren? | nein | nein | nein | nein | nein | nein | nein | ja | nein | nein |
| internet | 3 | Wo wird das Produkt eingesetzt? Wird Internet benötigt? kein Internet (Wald)instabiles / langsames Internet (Kurs, ÖV)stabiles / schnelles Internet (Zuhause) | instabiles stabiles | stabiles | kein Internet instabiles stabiles | instabiles stabiles | instabiles stabiles | kein internet instabiles stabiles | instabiles stabiles | kein internet instabiles stabiles | instabiles stabiles | stabiles |
| content_types | 4 | Welche Datenformate werden verwendet (ankreuzen)? AudioVideoTextBild | AudioVideoTextBild | AudioVideoTextBild | AudioVideoBild | AudioVideoTextBild | AudioVideoTextBild | audio | text bild | text bild | text bild | text bild |
| simultan | 2 | Müssen mehrere Personen gleichzeitig mit dem Tool etwas erarbeiten/verändern können? | nein | nein | nein | ja | ja | nein | ja | ja | ja | ja |
| creators | 7 | Wird das Tool durch die Projektgruppe erstellt oder von einer externer Firma? | | | | | | | | | | |
| self | 8 | Gibt es im Team die folgenden Skills? Skala 1-10 1 = Kann eine Seite ausdrucken 10 = Kann Java programmieren | programmieren | programmieren | hochladen | programmieren light | programmieren light | hochladen | Basic | Basic | Basic | Programmieren light |
| external | 9 | Welches Budget steht zur Verfügung? gross >50k mittel 11-49k klein <10k | gross | gross | klein | mittel | klein | klein | klein | klein | klein | mittel |
| interaction | 5 | Sollen die Nutzenden mit dem Produkt interagieren können? gar nichtkommentieren / likenInhalte erstellen | gar nicht kommentieren/liken | gar nicht | gar nicht kommentieren/liken | gar nicht kommentieren/liken Inhalte erstellen | gar nicht kommentieren/liken | gar nicht kommentieren/liken | gar nicht kommentieren/liken Inhalte erstellen | gar nicht | gar nicht kommentieren/liken Inhalte erstellen | gar nicht kommentieren/liken Inhalte erstellen |
| feedback | 6 | Muss das Feedback auf die Interaktion automatisch generiert werden (z.B. Quiz, Datenberechnung, richtig oder falsch etc.)? | Ja | Ja | Nein | ja | Ja | Nein | nein | Nein | Ja | Ja |
| modification | 10 | Wie viel Vorwissen braucht es für das Anpassen der Inhalte? | viel | viel | mittel | viel | mittel | mittel | wenig | wenig | wenig | viel |
| moderation | 11 | Wie viel Aufwand bin ich bereit aufzuwenden für die Moderation (Forum, Community...)? | wenig | kein | viel | viel | kein | viel | wenig | kein | viel | viel |
| passen nicht | | Gibt es eine wiederkehrende Kosten (Lizenz, Hosting, Speicherplatz)? | nein | ja | ja? | ja | ja | ja? | tendent ja | nein | tendenz ja | ja |
| passen nicht | | Werden regelmässige technische (Sicherheits-)Updates benötigt? | ja | ja | nein | nein | ja | nein | nein | nein | nein | nein |
97 changes: 84 additions & 13 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from '@emotion/styled';
import React from 'react';
import NewProjectPage from './pages/NewProjectPage'
import PrinciplesPage from './pages/PrinciplesPage';
import SecurityPage from './pages/SecurityPage';
import NewProjectPage from './pages/it-guidelines/NewProjectPage'
import PrinciplesPage from './pages/it-guidelines/PrinciplesPage';
import SecurityPage from './pages/it-guidelines/SecurityPage';
import HomePage from './pages/HomePage'
import { withTranslation } from 'react-i18next';
import { useTranslation } from 'react-i18next';
Expand All @@ -12,12 +12,19 @@ import {
Link,
Routes,
} from "react-router-dom";
import AcquisitionPage from './pages/AcquisitionPage';
import CommunityPage from './pages/CommunityPage';
import { faScroll, faLock, faTools, faShoppingCart, faUsers, faHandsHelping, faCalendarAlt } from '@fortawesome/free-solid-svg-icons'
import AcquisitionPage from './pages/it-guidelines/AcquisitionPage';
import CommunityPage from './pages/it-guidelines/CommunityPage';
import { faScroll, faLock, faTools, faShoppingCart, faUsers, faHandsHelping, faCalendarAlt, faCompass } from '@fortawesome/free-solid-svg-icons'
import { library } from '@fortawesome/fontawesome-svg-core'
import Footer from './components/Footer';
import ImpressumPage from './pages/ImpressumPage';
import ItGuidelinesPage from './pages/ItGuidelinesPage';
import DigitalisationPage from './pages/DigitalisationPage';
import NewDigitalisationProjectPage from './pages/digitalisation/NewDigitalisationProjectPage';
import DocumentationPage from './pages/digitalisation/DocumentationPage';
import CompletionPage from './pages/CompletionPage';
import OrganisationPage from './pages/it-guidelines/OrganisationPage';


const Nav = styled.nav`
display: flex;
Expand All @@ -30,6 +37,14 @@ const Nav = styled.nav`
padding: 0;
overflow: hidden;
display: flex;
li {
border-right: 1px solid white;
margin: 5px 0;
&:hover ul:first-of-type {
display: block;
}
}
}
a, button {
Expand All @@ -55,6 +70,18 @@ const Nav = styled.nav`
}
}
`
const SubNav = styled.ul`
display: none;
position: absolute;
background-color: var(--color-primary);
list-style-type: none;
padding-left: 0;
`

export const NavLocation = styled.div`
font-size: 0.8rem;
`

export const MainContainer = styled.main`
padding: 1rem;
Expand All @@ -76,17 +103,55 @@ export const Ul = styled.ul`
padding: 8px;
}
`
export const A = styled.a`
`

export const Infobox = styled.p`
background: rgba(250, 250, 250, 0.8);
border: 1px solid;
color: black;
padding: 9px;
width: 70%;
border-radius: 8px;
`

export const Box = styled.div`
display: flex;
margin-top: 60px;
border-top: 1px solid white;
`

const Header = () => {
const { t } = useTranslation()

library.add(faScroll, faLock, faTools, faShoppingCart, faUsers, faHandsHelping, faCalendarAlt)
library.add(faScroll, faLock, faTools, faShoppingCart, faUsers, faHandsHelping, faCalendarAlt, faCompass)

return <div className='nav'>
<Nav role="nav">
<ul>
<li><Link to="/">{t('home_page.title')}</Link></li>
<li><Link to="/new-project">{t('new_project_page.title')}</Link></li>
<li>
<Link to="/digitalisation">{t('digitalisation_page.title')}</Link>
<SubNav>
<li><Link to="/digitalisation/new-project">{t('new_project_digitalisation_page.title')}</Link></li>
<li><Link to="/digitalisation/documentation">{t('documentation_page.title')}</Link></li>
</SubNav>
</li>
<li>
<Link to="/it-guidelines">{t('it_guidelines_page.title')}</Link>
<SubNav>
<li><Link to="/it-guidelines/new-project">{t('new_project_guidelines_page.title')}</Link></li>
<li><Link to="/it-guidelines/principles">{t('principles_page.title')}</Link></li>
<li><Link to="/it-guidelines/security">{t('security_page.title')}</Link></li>
<li><Link to="/it-guidelines/acquisition">{t('acquisition_page.title')}</Link></li>
<li><Link to="/it-guidelines/community">{t('community_page.title')}</Link></li>
<li><Link to="/it-guidelines/organisation">{t('organisation_page.title')}</Link></li>
</SubNav>
</li>
<li>
<Link to="/completion">{t('completion_page.title')}</Link>
</li>
</ul>
</Nav>
</div>
Expand All @@ -96,11 +161,17 @@ function App() {
return <Router basename="/">
<Header></Header>
<Routes>
<Route path="/priciples" element={<PrinciplesPage/>}/>
<Route path="/acquisition" element={<AcquisitionPage/>}/>
<Route path="/community" element={<CommunityPage/>}/>
<Route path="/security" element={<SecurityPage/>}/>
<Route path="/new-project" element={ <NewProjectPage/>}/>
<Route path="/it-guidelines" element={<ItGuidelinesPage/>}/>
<Route path="/digitalisation" element={<DigitalisationPage/>}/>
<Route path="/completion" element={<CompletionPage/>}/>
<Route path="/digitalisation/new-project" element={ <NewDigitalisationProjectPage/>}/>
<Route path="/digitalisation/documentation" element={ <DocumentationPage/>}/>
<Route path="/it-guidelines/principles" element={<PrinciplesPage/>}/>
<Route path="/it-guidelines/acquisition" element={<AcquisitionPage/>}/>
<Route path="/it-guidelines/community" element={<CommunityPage/>}/>
<Route path="/it-guidelines/organisation" element={<OrganisationPage/>}/>
<Route path="/it-guidelines/security" element={<SecurityPage/>}/>
<Route path="/it-guidelines/new-project" element={ <NewProjectPage/>}/>
<Route path="/impressum" element={<ImpressumPage/>}/>
<Route path="/" element={<HomePage/>}/>
</Routes>
Expand Down
Loading

0 comments on commit 7d0c9b2

Please sign in to comment.