Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tekniskmuseum styling #153

Merged
merged 80 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
bc645f5
initial (empty) commit to establish release branch for the I/O exhibi…
computas-kso Jan 20, 2022
622ca40
Change background to dark grid pattern
computas-kso Jan 21, 2022
1ae48a2
Buttons: introduce sass-variables for button colors, and set white ba…
computas-kso Jan 21, 2022
89215c6
Text: introduce sass-variables for primary and secondary text colors,…
computas-kso Jan 20, 2022
4968034
Lint issues (double quotemark and missing whitespace)
computas-kso Jan 21, 2022
b2a5121
Merge pull request #107 from computas/background_and_colors
computas-hal Jan 21, 2022
b6650e0
Buttons: change content color according to figma sketches.
computas-kso Jan 21, 2022
b17f586
Buttons on welcome page: linear gradient background color on icons, a…
computas-kso Jan 21, 2022
a5b7abc
Player mode icon on game-info page: linear gradient background color.
computas-kso Jan 21, 2022
5d1eab3
Change color of spinner according to figma sketches.
computas-kso Jan 21, 2022
5c7dd19
Merge pull request #108 from computas/colors
computas-kso Jan 21, 2022
a87e8fc
Adds Aeonik fonts. Uses Aeonik Light as default font, Regular for but…
computas-kso Jan 21, 2022
fd5287d
Adds font Aeonik-Black, and uses it for game-info-text-header, word-t…
computas-kso Jan 21, 2022
12e7440
Merge pull request #109 from computas/fonts
computas-kso Jan 24, 2022
a01b69a
Fix font path
computas-kso Jan 24, 2022
ead426c
Merge pull request #110 from computas/fix_font_path
computas-kso Jan 24, 2022
ea4bd00
Replace avatars with io-illustration
computas-kso Jan 24, 2022
b93a680
Change color of loser points to same as winner points
computas-kso Jan 24, 2022
592faea
Merge pull request #111 from computas/avatar
computas-kso Jan 24, 2022
397f528
Add io-illustration for avatar image
computas-kso Jan 24, 2022
169690b
Merge pull request #112 from computas/avatar_img
computas-kso Jan 24, 2022
a62e261
Fix avatar size
computas-kso Jan 24, 2022
1326bcd
Merge pull request #113 from computas/avatar_size
computas-kso Jan 24, 2022
ae7be84
Fix avatar size on drawing page
computas-kso Jan 24, 2022
f2719e8
Merge pull request #114 from computas/avatar_size_drawingpage
computas-kso Jan 24, 2022
a58bbb3
Change colors on buttons in timer dialog
computas-kso Jan 26, 2022
daf6298
Merge pull request #115 from computas/timerdialog
computas-kso Jan 26, 2022
eb71459
Put IO-logo in top left corner. Move words-remaining.
computas-kso Jan 26, 2022
0282951
Rename Kunstig Jens to IO
computas-kso Jan 26, 2022
d48b214
Merge pull request #116 from computas/logo
computas-kso Jan 26, 2022
8b86146
Replace avatar on welcome page with animated logo
computas-kso Jan 27, 2022
f207af8
Merge pull request #117 from computas/animated_logo
computas-kso Jan 27, 2022
3ed12f6
Replace button icons according to figma sketches: Replace arrows with…
computas-kso Jan 27, 2022
4bb8dfb
Merge pull request #118 from computas/button_icons
computas-kso Jan 27, 2022
4e914a9
Drawing board: replace eraser icon with trashcan
computas-kso Jan 27, 2022
230bc83
Change colors on guess-label in drawing board.
computas-kso Jan 27, 2022
8117a9d
Change color of word to draw in drawing board.
computas-kso Jan 27, 2022
c15a10f
Merge pull request #119 from computas/drawingboard
computas-kso Jan 27, 2022
9aabd08
Drawing board: change background to dark grid pattern.
computas-kso Jan 27, 2022
cae737f
Merge pull request #120 from computas/drawingboard_background
computas-kso Jan 27, 2022
d2f441b
Drawing board: fix background.
computas-kso Jan 27, 2022
2c94f35
Merge pull request #121 from computas/fix_drawingboard_background
computas-kso Jan 27, 2022
cb55228
Drawing board: revert background.
computas-kso Feb 1, 2022
50f9481
Merge pull request #122 from computas/revert_drawingboard_background
computas-kso Feb 1, 2022
3c06152
added id to env
axelbaxel Feb 22, 2022
9d15d2c
added paring to admin panel
axelbaxel Feb 23, 2022
6cbbc7f
store pair-id in localstorage
axelbaxel Feb 23, 2022
f71bee3
lint fixes
axelbaxel Feb 23, 2022
505fd6b
styled pair-id input
axelbaxel Feb 24, 2022
ff0fd9f
made id readable by backend
axelbaxel Feb 24, 2022
91b80ee
possible cors fix
axelbaxel Mar 2, 2022
1d03788
Merge branch 'pair-id' into teknisk-adjustments
axelbaxel Mar 2, 2022
45f6b54
small design change for more spacing
axelbaxel Mar 2, 2022
efe3741
added link to admin from frontpage and backbutton
axelbaxel Mar 3, 2022
389e486
Merge pull request #129 from computas/teknisk-adjustments
axelbaxel Mar 4, 2022
1ea4872
fix environment
axelbaxel Mar 4, 2022
9d6489d
fixed pairing and sp after mp
axelbaxel Mar 10, 2022
a7f29b9
Merge pull request #132 from computas/fix/fix-multiplayer-issues
axelbaxel Mar 10, 2022
fc6f12f
removed a margin
axelbaxel Mar 18, 2022
0b2beed
Slightly hacky workaround for visual bug
axelbaxel Mar 21, 2022
221c809
Revert "Slightly hacky workaround for visual bug"
axelbaxel Mar 21, 2022
db52925
fixed visual safari bug
axelbaxel Mar 21, 2022
6630edc
better solution using only css
axelbaxel Mar 22, 2022
3d8e2e7
moved rule to timer
axelbaxel Mar 22, 2022
eb1e431
Merge pull request #133 from computas/fix/safari-visual-bug
axelbaxel Mar 23, 2022
d667e0d
raised welcome text
axelbaxel May 24, 2022
16be586
Merge pull request #136 from computas/design/raise-text
axelbaxel May 24, 2022
45b987f
test: remove tests
eTallang Jun 7, 2024
7df8d1d
build: update project configuration to mirror the initial angular 18 …
eTallang Jun 7, 2024
f712940
chore: add poor type fixes to make app run
eTallang Jun 7, 2024
13beadd
fix: build output is in the wrong folder
eTallang Jun 7, 2024
4edb40f
chore: add example script to display the usage of environment configu…
eTallang Jun 7, 2024
818e16a
docs: update readme
eTallang Jun 7, 2024
a6b63fa
Updates PR workload to use Bun. Removes unused test step
ThomasBakkenMoe-Computas Jun 7, 2024
dd092c1
Merge branch 'migrate-to-angular-18' of https://github.com/computas/t…
ThomasBakkenMoe-Computas Jun 7, 2024
ef90b92
chore(lint): install lint and fix lint errors
eTallang Jun 7, 2024
1e04a56
Merge branch 'migrate-to-angular-18' of github.com:computas/tekniskmu…
eTallang Jun 7, 2024
ca006a9
Merge branch 'migrate-to-angular-18' into tekniskmuseum-styling
ThomasBakkenMoe-Computas Jun 13, 2024
bb0511d
fix: ugyldige asset referanser
eTallang Jun 13, 2024
f34354f
fix: lint issues
eTallang Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .browserslistrc

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy to teknisk museum Production(ambitious-pond)
name: Azure Static Web Apps CI/CD

on:
workflow_dispatch:
Expand Down
28 changes: 13 additions & 15 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Lint, Test & Build
name: Lint & Build

on:
push:
Expand All @@ -10,27 +10,25 @@ on:

jobs:
build:
name: Lint & Build
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x]
node-version: [21.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Checkout ✔️
uses: actions/checkout@v4

- name: Install dependencies
run: npm ci
- name: Setup bun 🥟
uses: oven-sh/setup-bun@v1

- name: Lint
run: npm run lint
- name: Install dependencies 📝
run: bun install

- name: Test
run: npm run test:ci
- name: Run Lint 🧼
run: bun run lint

- name: Build
run: npm run build:ci
- name: Build 🛠️
run: bun run build
26 changes: 11 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,46 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.

# compiled output
# Compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
# Node
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json
npm-debug.log
yarn-error.log

# IDEs and editors
/.idea
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
# System files
.DS_Store
Thumbs.db
43 changes: 37 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,44 @@
# Tekniskmuseum

## Setup
Dette er repoet som står for front-end biten av Teknisk Museum-prosjektet "Kunstig Jens". Her finner du svar på de viktigste tingene du trenger å kunne for å starte opp applikasjonen.

Run `npm install`
## Oppsett

## Development server
1. Prosjektet bruker [Bun](https://bun.sh) for pakkebehandling og kjøring av kode. Om du ikke har installert Bun, kan det gjøres slik:

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
```shell
# For MacOS, Linux, og WSL
curl -fsSL https://bun.sh/install | bash

## Documentation
https://confluence.computas.com/display/SO/Teknisk+museum
# For Windows
powershell -c "irm bun.sh/install.ps1|iex"
```

2. Deretter kan du installere avhengighetene i prosjektet ved å kjøre

```shell
bun install
```

3. Til slutt kan du starte opp det lokale utviklingsmiljøet ved å kjøre

```shell
bun run start
```

## Forskjellige miljøer

Om man ønsker å gå mot forskjellige miljøer, er det satt opp et sett med forskjellige konfigurasjoner i prosjektet. Disse finner man i mappen `/src/environments/`. Om man f.eks. ønsker å bruke konfigurasjonen "Computas", kan man gjøre det ved å legge til argumentet `--configuration` når man starter opp det lokale utviklingsmiljøet. Det vil si at man da kjører scriptet

```shell
bun run start --configuration computas
```

## Oppstår det problemer i teamet forbundet med bruk av Bun?

Ikke noe problem! Dere kan enkelt gå over til mer tradisjonelle verktøy som Yarn eller NPM. Da er det bare å gjøre følgende:

- Slett `bun.lockb` filen.
- Endre workflowene i `.github/workflows` til å ikke bruke Bun (dvs erstatt trinnet `uses: oven-sh/setup-bun@v1` samt andre kall som bruker Bun).
- Skriv inn ny pakkebehandler i feltet `cli.packageManager` i `angular.json`.
- Lag en ny lockfil med den nye pakkebehandleren ved å kjøre hhv. `npm i` eller `yarn`.
Loading
Loading