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

Version 1.2.0 #5

Merged
merged 4 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
72 changes: 72 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '37 13 * * 4'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
45 changes: 2 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"last 2 versions",
"not dead"
],
"dependencies": {
"friendly-helper": "^1.7.1"
},
"authors": [
{
"name": "Jonas Pfalzgraf",
Expand Down
3 changes: 3 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"default_title": "BrowserExtensionTemplate",
"default_popup": "popup.html"
},
"options_ui": {
"page": "options.html"
},
"permissions": [
"notifications"
],
Expand Down
26 changes: 26 additions & 0 deletions public/options.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="./favicon.ico">
<title>{{BET}} Options</title>
<link rel="stylesheet" href="css/app.css">
</head>
<body>
<noscript>
<strong>We're sorry but {{BET}} doesn't work properly without JavaScript enabled. Please enable it to
continue.</strong>
</noscript>
<div id="app">
<img src="./icons/icon128.png" class="logo" />
<h1>Settings</h1>
<div id="settings">
</div>
</div>
<footer>
<script type="module" src="./js/classes/settings.js"></script>
</footer>
</body>
</html>
8 changes: 7 additions & 1 deletion src/app.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Session } from "./classes/session.js"

class App {

private static contentEntry: string = "content"
Expand All @@ -8,15 +10,19 @@ class App {
}

async main(): Promise<void> {

console.log("Hello World")
}

async drawData(): Promise<void> {
const session = Session.getInstance()
const contentRoot = <HTMLDivElement>document.getElementById(App.contentEntry)
const body = document.createElement("div")
const title = document.createElement("h1")
const text = document.createElement("p")
title.innerText = "Hello World"
text.innerText = session.contentTest
body.appendChild(title)
body.appendChild(text)
contentRoot.appendChild(body)
}
}
Expand Down
1 change: 0 additions & 1 deletion src/background.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class Background {

constructor() {
Expand Down
55 changes: 55 additions & 0 deletions src/classes/session.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
export class Session {

private static instance: Session;

private constructor() {
}

static getInstance() {
if (!Session.instance && !Session.load()) {
Session.instance = new Session();
}
if (!Session.instance && Session.load()) {
Session.instance = <Session>Session.load();
}
Session.save();
return Session.instance;
}

public static save() {
localStorage.setItem('session', JSON.stringify(this.instance));
}

public static load(): Session | null {
const session = localStorage.getItem('session');
if (session) {
const obj = <Session>JSON.parse(session);
const result = new Session();
result.contentTest = obj.contentTest;
return result;
}
return null;
}

public static reloadSession() {
const session = localStorage.getItem('session');
if (session) {
const obj = <Session>JSON.parse(session);
const result = new Session();
result.contentTest = obj.contentTest;
Session.instance = result;
}
}

public static resetSession() {
localStorage.removeItem('session');
sessionStorage.removeItem('session');
this.instance = new Session();
Session.save();
location.reload();
}

public readonly sessionId: string = crypto.randomUUID();

public contentTest: string = 'This is a simple example of a web application';
}
29 changes: 29 additions & 0 deletions src/classes/settings.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { Session } from "./session.js";

class Settings {

private session = Session.getInstance();

constructor() {
this.renderSettings();
}

private async renderSettings(): Promise<void> {
const settings = <HTMLDivElement>document.getElementById('settings');
settings.innerHTML = `
<div class="form-group">
<label for="contentTest">Content Test</label>
<input type="text" class="form-control" id="contentTest" placeholder="Enter content test" value="${this.session.contentTest}">
</div>
<button type="button" class="btn btn-primary" id="saveSettings">Save</button>
`;
const saveSettings = <HTMLButtonElement>document.getElementById('saveSettings');
saveSettings.addEventListener('click', () => {
this.session.contentTest = (<HTMLInputElement>document.getElementById('contentTest')).value;
Session.save();
Session.reloadSession();
});
}
}

new Settings();
8 changes: 5 additions & 3 deletions src/sass/_mixin.sass
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@

@mixin partialButton
button
width: 100% !important
height: 100% !important
width: 5rem !important
height: 2rem !important
text-align: center !important
margin: 0 !important
margin: 0.5rem !important
border-color: $seccond-color !important
border-radius: 0.5rem !important

@include respond-to(handhelds)
font-size: 3rem
Expand Down
2 changes: 1 addition & 1 deletion src/sass/_root.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ $main-font-color: white
$main-font-color-hover: lightgrey
$main-uschrift-font: 'Ubuntu', Arial
$seccond-color: lightgrey
$background-color: rgb(119, 178, 255)
$background-color: #77B2FF
$background-color-content: rgb(198, 223, 255)
$logo-image: url('../icons/icon128.png')
2 changes: 1 addition & 1 deletion tools/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function findHtmlFilesRecursive(source: string): string[] {
}

function replaceKeywordsInHtmlFile(file: string) {
const content = fs.readFileSync(file, 'utf8');
let content = fs.readFileSync(file, 'utf8');
const pairs = appConfig.htmlTemplatePairs;
pairs.forEach(function (pair: object) {
// @ts-ignore
Expand Down