Skip to content

Commit

Permalink
Merge branch 'main' into admin-ui-fix-henry-bug-too
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferMarthinsen committed May 24, 2024
2 parents a817425 + 1302a85 commit ee752ca
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 17 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: CI
on: push
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install modules
run: npm install
- name: Run ESLint
run: eslint . --ext .js,.jsx,.ts,.tsx
19 changes: 8 additions & 11 deletions .github/workflows/main_app-kabinizer-client-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- uses: actions/checkout@v4

- name: Set up Node.js version
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "18.x"
node-version: 'lts/*'

- name: bun install, build
- name: npm install, build
run: |
cd kabinizer-front-end
bun install
bun run build
npm install
npm run build
rm -rf node_modules
- name: Upload artifact for deployment job
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: node-app
path: ./kabinizer-front-end/dist
Expand All @@ -46,7 +43,7 @@ jobs:

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: node-app

Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This workflow executes several linters on changed files based on languages used in your code base whenever
# you push a code or open a pull request.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/github/super-linter
name: Lint Code Base

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
run-lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
# Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter@v4
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: "main"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25 changes: 19 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
# Kabinizer: Your Cabin Booking Solution
# Hytte.ro: Your Cabin Booking Solution

Welcome to Kabinizer, a comprehensive solution for cabin booking based in Stavanger. This project is designed to
streamline the process of booking and managing cabin reservations, making it easier for both administrators and users.
Welcome to Hytte.ro, a comprehensive solution for cabin booking based in Stavanger. This project is designed to streamline the process of booking and managing cabin reservations, making it easier for both administrators and users.

You can view the design and user interface prototype for Hytte.ro on Figma [here](https://www.figma.com/design/uq5qeXZh25cjfIaOtZmtXy/Kabinizer-%E2%9C%A8-Enhanced-%F0%9F%A7%9A?node-id=0%3A1&t=aQ2dogROHVA1RqDf-1).

Before you get started, please review the overview and architecture of the system.

If you have any questions or need assistance, please don't hesitate to reach out to the project team on slack or
email [[email protected]](mailto:[email protected]).

## Why Hytte.ro?

The previous name, "Kabinizer," used "kabin," which typically refers to an airplane cabin or a ship's cabin. That didn’t quite hit the mark.

Sure, "Kabinizer" sounded good when spoken out loud, but it didn't quite capture the cozy cabin vibes we were aiming for. So, we decided to switch things up and find a name that truly resonates with our vision. That's when "Hytte.ro" came into play!

After a few caffeine-fueled searches, we stumbled upon the TLD “.ro,” and it just clicked.

In Norwegian, "hytte" means "cabin," perfectly capturing the essence of what we're all about. Plus, the ".ro" ending? It exudes calm and peace (literally, "ro" means "peace" in Norwegian).

So, here we are, all set to offer you the slickest, friendliest cabin booking solution out there.

## System Overview and Architecture

Kabinizer's main aim is to organize cabin raffles in the Stavanger area. Users can request a specific period, and once
Hytte.ro's main aim is to organize cabin raffles in the Stavanger area. Users can request a specific period, and once
the deadline is reached, the system randomly picks a user to be awarded that period.

The system is designed with administrators in mind, making it easy for them to keep track of requests and allocations.
Expand All @@ -22,7 +35,7 @@ Here's a simple "ER"-ish diagram of the system to help you get a grip on the sys

```mermaid
---
title: ER-ish diagram of Kabinizer (In theory how the system should work)
title: ER-ish diagram of Hytte.ro (In theory how the system should work)
---
erDiagram
Draw {
Expand Down Expand Up @@ -62,7 +75,7 @@ For more details, please refer to the [kabinizer-front-end](kabinizer-front-end/

[![Build and deploy ASP.Net Core app to Azure Web App - app-kabinizer-dev](https://github.com/miles-no/miles_kabinizer/actions/workflows/main_app-kabinizer-dev.yml/badge.svg)](https://github.com/miles-no/miles_kabinizer/actions/workflows/main_app-kabinizer-dev.yml)

The backend of Kabinizer is a controller-based .NET 8 web API, utilizing Entity Framework as an object-relational
The backend of Hytte.ro is a controller-based .NET 8 web API, utilizing Entity Framework as an object-relational
mapper (ORM). It includes a Docker Compose file for setting up a SQL Server database, making it easy to manage and
access data.

Expand Down

0 comments on commit ee752ca

Please sign in to comment.