Merge pull request #14 from thefeli73/develop

release v1.0.0
This commit is contained in:
Felix Schulze 2019-11-12 18:53:52 +01:00 committed by GitHub
commit 21cecab368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 31915 additions and 362 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
node_modules/ node_modules/
dist/ dist/

6
README.md Normal file
View File

@ -0,0 +1,6 @@
# Meritkollen [![CodeFactor](https://www.codefactor.io/repository/github/thefeli73/meritkollen/badge)](https://www.codefactor.io/repository/github/thefeli73/meritkollen)
En enkel meritkalkylator
## Link
https://meritkollen.se/

318
gulpfile.js Normal file
View File

@ -0,0 +1,318 @@
/**
* Settings
* Turn on/off build features
*/
var settings = {
clean: true,
scripts: true,
polyfills: true,
styles: true,
svgs: true,
copy: true,
reload: true
};
/**
* Paths to project folders
*/
var paths = {
input: 'src/',
output: 'dist/',
scripts: {
input: 'src/js/*.js',
polyfills: '.polyfill.js',
output: 'dist/js'
},
styles: {
input: 'src/css/**/*.{scss,sass,css}',
output: 'dist/css/'
},
svgs: {
input: 'src/svg/*.svg',
output: 'dist/svg/'
},
copy: {
input: ['src/**/*', '!src/js/**', '!src/css/**'],
output: 'dist/'
},
reload: './dist/'
};
/**
* Template for banner to add to file headers
*/
var banner = {
main:
'/*!' +
' <%= package.name %> v<%= package.version %>' +
' | (c) ' + new Date().getFullYear() + ' <%= package.author.name %>' +
' | <%= package.license %> License' +
' | <%= package.repository.url %>' +
' */\n'
};
/**
* Gulp Packages
*/
// General
var {gulp, src, dest, watch, series, parallel} = require('gulp');
var del = require('del');
var flatmap = require('gulp-flatmap');
var lazypipe = require('lazypipe');
var rename = require('gulp-rename');
var header = require('gulp-header');
var package = require('./package.json');
var hashsrc = require("gulp-hash-src");
// Scripts
var jshint = require('gulp-jshint');
var stylish = require('jshint-stylish');
var concat = require('gulp-concat');
var uglify = require('gulp-terser');
var optimizejs = require('gulp-optimize-js');
// Styles
var sass = require('gulp-sass');
var postcss = require('gulp-postcss');
var prefix = require('autoprefixer');
var minify = require('cssnano');
// SVGs
var svgmin = require('gulp-svgmin');
// BrowserSync
var browserSync = require('browser-sync');
/**
* Gulp Tasks
*/
// Remove pre-existing content from output folders
var cleanDist = function (done) {
// Make sure this feature is activated before running
if (!settings.clean) return done();
// Clean the dist folder
del.sync([
paths.output
]);
// Signal completion
return done();
};
// Repeated JavaScript tasks
var jsTasks = lazypipe()
.pipe(optimizejs)
//.pipe(rename, {suffix: '.min'})
.pipe(uglify)
.pipe(header, banner.main, {package: package})
.pipe(dest, paths.scripts.output);
// Lint, minify, and concatenate scripts
var buildScripts = function (done) {
// Make sure this feature is activated before running
if (!settings.scripts) return done();
// Run tasks on script files
return src(paths.scripts.input)
.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json",".webp",".jpg",".css",".png",".ico",".js"],
regex:/\s*(?:(")([^"]*)|(')([^']*))/ig,
analyze: function analyze(match){return {prefix: "'",link:match[4],suffix: ''};}
}))
.pipe(flatmap(function(stream, file) {
// If the file is a directory
if (file.isDirectory()) {
// Setup a suffix variable
var suffix = '';
// If separate polyfill files enabled
if (settings.polyfills) {
// Update the suffix
suffix = '.polyfills';
// Grab files that aren't polyfills, concatenate them, and process them
src([file.path + '/*.js', '!' + file.path + '/*' + paths.scripts.polyfills])
.pipe(concat(file.relative + '.js'))
.pipe(jsTasks());
}
// Grab all files and concatenate them
// If separate polyfills enabled, this will have .polyfills in the filename
src(file.path + '/*.js')
.pipe(concat(file.relative + suffix + '.js'))
.pipe(jsTasks());
return stream;
}
// Otherwise, process the file
return stream.pipe(jsTasks());
}));
};
// Lint scripts
var lintScripts = function (done) {
// Make sure this feature is activated before running
if (!settings.scripts) return done();
// Lint scripts
return src(paths.scripts.input)
.pipe(jshint())
.pipe(jshint.reporter('jshint-stylish'));
};
// Process, lint, and minify Sass files
var buildStyles = function (done) {
// Make sure this feature is activated before running
if (!settings.styles) return done();
// Run tasks on all Sass files
return src(paths.styles.input)
.pipe(sass({
outputStyle: 'compressed',
sourceComments: false
}))
.pipe(postcss([
prefix({
cascade: true,
remove: true
})
]))
//.pipe(rename({suffix: '.min'}))
.pipe(postcss([
minify()
]))
.pipe(header(banner.main, {package: package}))
.pipe(hashsrc({build_dir:paths.output,src_path:'src',hash_len:"6",query_name:"v"}))
.pipe(dest(paths.styles.output));
};
// Optimize SVG files
var buildSVGs = function (done) {
// Make sure this feature is activated before running
if (!settings.svgs) return done();
// Optimize SVG files
return src(paths.svgs.input)
.pipe(svgmin())
.pipe(dest(paths.svgs.output));
};
// Copy static files into output folder
var copyFiles = function (done) {
// Make sure this feature is activated before running
if (!settings.copy) return done();
// Copy static files
return src(paths.copy.input)
.pipe(dest(paths.copy.output));
};
// updates version in all assets
var updateAssetVersion = function (done) {
return src('src/**/*.{php,html}')
.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v"}))
.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json"]}))
.pipe(dest(paths.output));
};
// updates version in SW
var swTasks = lazypipe()
.pipe(optimizejs)
.pipe(uglify)
.pipe(header, banner.main, {package: package})
.pipe(dest, paths.output);
var buildSW = function (done) {
return src('src/sw.js')
.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json",".webp",".jpg",".css",".png",".ico",".js"],
regex:/\s*(?:(")([^"]*)|(')([^']*))/ig,
analyze: function analyze(match){return {prefix: "'",link:match[4],suffix: ''};}
}))
.pipe(swTasks())
.pipe(dest(paths.output));
};
// Watch for changes to the src directory
var startServer = function (done) {
// Make sure this feature is activated before running
if (!settings.reload) return done();
// Initialize BrowserSync
browserSync.init({
server: {
baseDir: paths.reload
}
});
// Signal completion
done();
};
// Reload the browser when files change
var reloadBrowser = function (done) {
if (!settings.reload) return done();
browserSync.reload();
done();
};
// Watch for changes
var watchSource = function (done) {
watch(paths.input, series(exports.default, reloadBrowser));
done();
};
/**
* Export Tasks
*/
// Default task
// gulp
exports.default = series(
cleanDist,
parallel(
copyFiles,
lintScripts,
buildSVGs
),
buildStyles,
buildScripts,
updateAssetVersion,
buildSW,
);
// Watch and reload
// gulp watch
exports.watch = series(
exports.default,
//startServer,
watchSource
);

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 MiB

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="assets/img/favicon/mstile-70x70.png"/>
<square150x150logo src="assets/img/favicon/mstile-150x150.png"/>
<square310x310logo src="assets/img/favicon/mstile-310x310.png"/>
<TileColor>#2b5797</TileColor>
</tile>
</msapplication>
</browserconfig>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,28 +0,0 @@
<?php
echo "
<form id='programmes' name='programmes'>
<form class='courses kurser'>
<div class='sample_row' style='display:none;'>
<!--SAMPLE ROW-->
<div style='display:flex;'>
<li class='mdl-list__item mdl-list__item--two-line' style='overflow:visible;padding: 16px 24px 16px 16px;width:175px'>
<span class='mdl-list__item-primary-content'>
<input class='mdl-list__item-primary-content' style='margin:-4px 0 6px; height:24px;' type='text' value='Extra Kurs'>
<span class='points mdl-list__item-sub-title'>Poäng:</span>
</span></li>
<input class='points mdl-list__item-sub-title' style='width:30px; height:24px; margin:40px 32px 16px -62px;-moz-appearance: textfield;' type='number' value='100'>
<select class='grade'>
<option value='0'>F</option>
<option selected value='10'>E</option>
<option value='12.5'>D</option>
<option value='15'>C</option>
<option value='17.5'>B</option>
<option value='20'>A</option>
</select>
<a class='delete_row mdl-button mdl-js-button mdl-button--accent mdl-js-ripple-effect' style='margin:16px 5px'>Ta Bort</a>
</div>
</div>
</form>
</form>
";

View File

@ -1,52 +0,0 @@
<?php
echo "
<meta http-equiv='content-language' content='sv-SE'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, user-scalable=yes'>
<meta name='description' content='Beräkna ditt gymnasie meritvärde inför univeritet eller högskola'>
<meta name='author' content='Felix Schulze'>
<meta HTTP-EQUIV='CACHE-CONTROL' CONTENT='public'>
<meta property='og:type' content='website'>
<meta property='og:site_name' content='meritkollen.se'>
<meta property='og:title' content='Räkna ut meritvärde'>
<meta property='og:description' content='Beräkna ditt gymnasie meritvärde inför univeritet eller högskola'>
<meta name='title' content='Räkna ut ditt meritvärde'>
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src='assets/js/modernizer-webp.js'></script>
<link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'>
<link disabled class='lateLoader' rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
<link rel='stylesheet' defer href='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css'>
<script data-ad-client='ca-pub-5143923140938916' defer src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'></script>
<link rel='stylesheet' async href='assets/css/main.min.css'>
<!--[if lt IE 9]>
<script src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js'></script>
<![endif]-->
<!--
XXXXXXX
FAVICON
XXXXXXX
-->
<link rel='apple-touch-icon' sizes='180x180' href='assets/img/favicon/apple-touch-icon.png'>
<link rel='icon' type='image/png' href='assets/img/favicon/favicon-32x32.png' sizes='32x32'>
<link rel='icon' type='image/png' href='assets/img/favicon/favicon-16x16.png' sizes='16x16'>
<link rel='manifest' href='assets/img/favicon/manifest.json'>
<link rel='mask-icon' href='assets/img/favicon/safari-pinned-tab.svg' color='#2b5797'>
<link rel='shortcut icon' href='assets/img/favicon/favicon.ico'>
<meta name='apple-mobile-web-app-title' content='Meritv&auml;rde'>
<meta name='application-name' content='Meritv&auml;rde'>
<meta name='msapplication-TileColor' content='#2b5797'>
<meta name='msapplication-TileImage' content='assets/img/favicon/mstile-144x144.png'>
<meta name='msapplication-config' content='assets/img/favicon/browserconfig.xml'>
<meta name='theme-color' content='#27233a'>
";

View File

@ -1,27 +0,0 @@
<?php
echo "
<script defer>
";
readfile("https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js");
readfile("https://code.getmdl.io/1.3.0/material.min.js");
readfile("https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/js/materialize.min.js");
readfile("assets/js/calcscript.js");
readfile("assets/js/changeall.js");
readfile("assets/js/sparabetyg.js");
readfile("assets/js/smallScript.js");
echo "
$(document).ready(function() {
$('select').material_select();
});
function updateGrade() {
$('select').material_select('destroy');
window.setTimeout(partB,0);
}
function partB(){
$(document).ready(function() {
$('select').material_select();
});
}
</script>
";

View File

@ -1,29 +0,0 @@
<?php
echo "
<div id='hider' style='display:none;height: 100vh;position: fixed;width: 100vw;top: 0;background-color: rgba(85, 85, 85, 0.74);z-index: 4;'></div>
<div id='popup' style='display:none;'>
<div style='margin:30px;'>
<h1>Tips</h1><br>
<h5>Glömt bort vilken kurs som innehåller vad? Håll muspekaren över en icke standard kurs för att se mer info.</h5><br><br>
<img src='assets/img/tips.jpg' width='100%' height='auto' alt='Tips' style='max-width:450px; margin:auto; display:block;'/>
</div>
</div>
<!--popup-->
<script>
$(document).ready(function() {
laddaBetyg();
if(localStorage.getItem('popupInfo') != 'sett'){
$('#popup').delay(1000).fadeIn();
$('#hider').delay(300).fadeIn();
}
$('body').click(function(e)
{
$('#popup').fadeOut();
$('#hider').fadeOut();
localStorage.setItem('popupInfo','sett')
});
});
</script>
";

View File

@ -1,5 +0,0 @@
User-agent: *
Disallow: /assets/
Disallow: /include/
Disallow: /404.html
Disallow: /50x.html

8675
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

53
package.json Normal file
View File

@ -0,0 +1,53 @@
{
"name": "Meritkollen",
"version": "1.0.0",
"description": "Den enkla meritkalkylatorn",
"main": "./dist/your-main-js-file.js",
"author": {
"name": "Felix Schulze",
"url": "https://meritkollen.se"
},
"license": "AGPL-3.0",
"repository": {
"type": "git",
"url": "https://github.com/thefeli73/meritkollen.git"
},
"boilerplate": {
"version": "2.2.5",
"author": "Chris Ferdinandi",
"url": "https://gomakethings.com",
"repo": "http://github.com/cferdinandi/gulp-boilerplate"
},
"browserslist": [
"last 2 versions",
"> 0.25%"
],
"devDependencies": {
"autoprefixer": "^9.6.1",
"browser-sync": "^2.26.7",
"cssnano": "^4.1.10",
"del": "^3.0.0",
"gulp": "^4.0.2",
"gulp-buster": "^1.1.0",
"gulp-cache-buster": "^0.2.1",
"gulp-concat": "^2.6.1",
"gulp-flatmap": "^1.0.2",
"gulp-hasher": "^0.1.0",
"gulp-header": "^2.0.5",
"gulp-htmlmin": "^5.0.1",
"gulp-jshint": "^2.1.0",
"gulp-optimize-js": "^1.1.0",
"gulp-postcss": "^8.0.0",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.2",
"gulp-svgmin": "^2.1.0",
"gulp-terser": "^1.1.7",
"gulp-usemin": "^0.3.30",
"jshint": "^2.9.6",
"jshint-stylish": "^2.2.1",
"lazypipe": "^1.0.1"
},
"dependencies": {
"gulp-hash-src": "^0.1.6"
}
}

45
html/404.html → src/404.html Executable file → Normal file
View File

@ -13,12 +13,12 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<link rel="stylesheet" href="/assets/css/main.min.css"> <link rel="stylesheet" href="/css/main.css">
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
<script async src="/js/modernizer-webp.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script> <script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script>
<script src="assets/js/loader.min.js"></script>
<script src="assets/js/softscrollscript.js"></script>
@ -30,51 +30,34 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link href="assets/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180"> <link href="/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
<link href="assets/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png"> <link href="/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
<link href="assets/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"> <link href="/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
<link href="assets/img/favicon/manifest.json" rel="manifest"> <link href="/img/favicon/manifest.json" rel="manifest">
<link color="#2b5797" href="assets/img/favicon/safari-pinned-tab.svg" rel="mask-icon"> <link color="#2b5797" href="/img/favicon/safari-pinned-tab.svg" rel="mask-icon">
<link href="assets/img/favicon/favicon.ico" rel="shortcut icon"> <link href="/img/favicon/favicon.ico" rel="shortcut icon">
<meta content="Meritv&auml;rde" name="apple-mobile-web-app-title"> <meta content="Meritv&auml;rde" name="apple-mobile-web-app-title">
<meta content="Meritv&auml;rde" name="application-name"> <meta content="Meritv&auml;rde" name="application-name">
<meta content="#2b5797" name="msapplication-TileColor"> <meta content="#2b5797" name="msapplication-TileColor">
<meta content="assets/img/favicon/mstile-144x144.png" name="msapplication-TileImage"> <meta content="/img/favicon/mstile-144x144.png" name="msapplication-TileImage">
<meta content="assets/img/favicon/browserconfig.xml" name="msapplication-config"> <meta content="/img/favicon/browserconfig.xml" name="msapplication-config">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-97913650-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body id="bg"> <body id="bg">
<!--loader--> <!--loader-->
<!--
XXXXXX
HEADER
XXXXXX
-->
<header class="parallaxHeader textCenter" id="pageContent"> <header class="parallaxHeader textCenter" id="pageContent">
<h1 id="bannerTitle" class="animate-bottom">404<br>Har du kommit fel?</h1><!-- <h1 class="bannerTitle animate-bottom">Error 404</h1>
XXXX <h5 class="bannerTitle animate-bottom" style="background-color:unset;">Har du kommit fel?</h5>
BODY
XXXX
-->
<a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a> <a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a>
</header> </header>
<script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

45
html/50x.html → src/50x.html Executable file → Normal file
View File

@ -13,13 +13,12 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<link rel="stylesheet" href="/assets/css/main.min.css"> <link rel="stylesheet" href="/css/main.css">
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
<script async src="/js/modernizer-webp.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script> <script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script>
<script src="assets/js/loader.min.js"></script>
<script src="assets/js/softscrollscript.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -30,51 +29,35 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link href="assets/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180"> <link href="/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
<link href="assets/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png"> <link href="/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
<link href="assets/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"> <link href="/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
<link href="assets/img/favicon/manifest.json" rel="manifest"> <link href="/img/favicon/manifest.json" rel="manifest">
<link color="#2b5797" href="assets/img/favicon/safari-pinned-tab.svg" rel="mask-icon"> <link color="#2b5797" href="/img/favicon/safari-pinned-tab.svg" rel="mask-icon">
<link href="assets/img/favicon/favicon.ico" rel="shortcut icon"> <link href="/img/favicon/favicon.ico" rel="shortcut icon">
<meta content="Meritv&auml;rde" name="apple-mobile-web-app-title"> <meta content="Meritv&auml;rde" name="apple-mobile-web-app-title">
<meta content="Meritv&auml;rde" name="application-name"> <meta content="Meritv&auml;rde" name="application-name">
<meta content="#2b5797" name="msapplication-TileColor"> <meta content="#2b5797" name="msapplication-TileColor">
<meta content="assets/img/favicon/mstile-144x144.png" name="msapplication-TileImage"> <meta content="/img/favicon/mstile-144x144.png" name="msapplication-TileImage">
<meta content="assets/img/favicon/browserconfig.xml" name="msapplication-config"> <meta content="/img/favicon/browserconfig.xml" name="msapplication-config">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-97913650-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body id="bg"> <body id="bg">
<!--loader--> <!--loader-->
<!--
XXXXXX
HEADER
XXXXXX
--> -->
<header class="parallaxHeader textCenter" id="pageContent"> <header class="parallaxHeader textCenter" id="pageContent">
<h1 id="bannerTitle" class="animate-bottom">50X<br>Något gick fel.</h1><!-- <h1 class="bannerTitle animate-bottom">Error 50X</h1>
XXXX <h5 class="bannerTitle animate-bottom" style="background-color:unset;">Något gick fel.</h5>
BODY
XXXX
-->
<a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a> <a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a>
</header> </header>
<script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

View File

@ -4,7 +4,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Ekonomi</title> <title>Ekonomi</title>
<meta name="keywords" content="Ekonomi,EkonomiProgrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="Ekonomi,Ekonomiprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<link rel="canonical" href="https://meritkollen.se/Ekonomi">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
?> ?>
@ -12,10 +13,9 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Ekonomi</h1> <h1 class="bannerTitle animate-bottom">Ekonomi</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Ekonomiprogrammet</h5>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -83,8 +83,6 @@ include "include/createCourse_end.php";
</header> </header>
<?php <?php
include "include/html_script_bottom_head.php"; include "include/html_script_bottom_head.php";
include "include/info.php";
?> ?>
</body> </body>
</html> </html>

View File

@ -5,6 +5,7 @@
<title>Estet</title> <title>Estet</title>
<meta name="keywords" content="estet,Estetiska,programmet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="estet,Estetiska,programmet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<link rel="canonical" href="https://meritkollen.se/Estet">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
?> ?>
@ -13,7 +14,8 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Estet</h1> <h1 class="bannerTitle animate-bottom">Estet</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Estetiska programmet</h5>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -80,8 +82,6 @@ include "include/createCourse_end.php";
</header> </header>
<?php <?php
include "include/html_script_bottom_head.php"; include "include/html_script_bottom_head.php";
include "include/info.php";
?> ?>
</body> </body>
</html> </html>

35
html/Kontakt.html → src/Kontakt.html Executable file → Normal file
View File

@ -5,19 +5,19 @@
<title>Kontakt</title> <title>Kontakt</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<meta name="description" content="En hemsida till för gymnasieelever som enkelt vill ta reda på sina meritpoäng till högskola eller universitet"> <meta name="description" content="Har du frågor? Maila oss!">
<meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<meta name="author" content="Felix Schulze"> <meta name="author" content="Felix Schulze">
<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public"> <meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
<link rel="canonical" href="https://meritkollen.se/Kontakt">
<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin> <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin> <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src="assets/js/modernizer-webp.js"></script> <script async src="/js/modernizer-webp.js"></script>
<link rel="stylesheet" async href="assets/css/main.min.css"> <link rel="stylesheet" async href="/css/main.css">
<link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'>
<link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'> <link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -30,20 +30,21 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link rel="apple-touch-icon" sizes="180x180" href="assets/img/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="assets/img/favicon/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="assets/img/favicon/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="assets/img/favicon/manifest.json"> <link rel="manifest" href="/img/favicon/manifest.json">
<link rel="mask-icon" href="assets/img/favicon/safari-pinned-tab.svg" color="#2b5797"> <link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="assets/img/favicon/favicon.ico"> <link rel="shortcut icon" href="/img/favicon/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde"> <meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
<meta name="application-name" content="Meritv&auml;rde"> <meta name="application-name" content="Meritv&auml;rde">
<meta name="msapplication-TileColor" content="#2b5797"> <meta name="msapplication-TileColor" content="#2b5797">
<meta name="msapplication-TileImage" content="assets/img/favicon/mstile-144x144.png"> <meta name="msapplication-TileImage" content="img/favicon/mstile-144x144.png">
<meta name="msapplication-config" content="assets/img/favicon/browserconfig.xml"> <meta name="msapplication-config" content="img/favicon/browserconfig.xml">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
</head> </head>
<body> <body>
@ -54,7 +55,7 @@ HEADER
XXXXXX XXXXXX
--> -->
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Kontakt</h1> <h1 class="bannerTitle animate-bottom">Kontakt</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -76,8 +77,8 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
</content> </content>
</div> </div>
</header> </header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="/js/jquery.js"></script>
<script defer src="assets/js/material.min.js"></script> <script defer src="/js/material.js"></script>
<script defer src="assets/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

View File

@ -4,7 +4,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Natur</title> <title>Natur</title>
<meta name="keywords" content="natur,Naturvetenskapliga,programmet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="natur,Naturvetenskaps­programmet,Naturvetenskapliga,programmet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<link rel="canonical" href="https://meritkollen.se/Natur">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
?> ?>
@ -13,7 +14,8 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Natur</h1> <h1 class="bannerTitle animate-bottom">Natur</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Naturvetenskaps­programmet</h5>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -79,8 +81,6 @@ include "include/createCourse_end.php";
</header> </header>
<?php <?php
include "include/html_script_bottom_head.php"; include "include/html_script_bottom_head.php";
include "include/info.php";
?> ?>
</body> </body>
</html> </html>

View File

@ -5,6 +5,7 @@
<title>Samhäll</title> <title>Samhäll</title>
<meta name="keywords" content="samhäll,Samhällsprogrammet,samhällsvetenskapsprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="samhäll,Samhällsprogrammet,samhällsvetenskapsprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<link rel="canonical" href="https://meritkollen.se/Samhäll">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
?> ?>
@ -13,7 +14,8 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Samhäll</h1> <h1 class="bannerTitle animate-bottom">Samhäll</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Samhällsvetenskapsprogrammet</h5>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -79,8 +81,6 @@ include "include/createCourse_end.php";
</header> </header>
<?php <?php
include "include/html_script_bottom_head.php"; include "include/html_script_bottom_head.php";
include "include/info.php";
?> ?>
</body> </body>
</html> </html>

View File

@ -3,7 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Teknik</title> <title>Teknik</title>
<meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<link rel="canonical" href="https://meritkollen.se/Teknik">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
?> ?>
@ -11,9 +13,9 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Teknik</h1> <h1 class="bannerTitle animate-bottom">Teknik</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Teknikprogrammet</h5>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>
@ -79,8 +81,6 @@ include "include/createCourse_end.php";
</header> </header>
<?php <?php
include "include/html_script_bottom_head.php"; include "include/html_script_bottom_head.php";
include "include/info.php";
?> ?>
</body> </body>
</html> </html>

8010
src/css/main.css Normal file

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 5.9 MiB

After

Width:  |  Height:  |  Size: 5.9 MiB

View File

Before

Width:  |  Height:  |  Size: 418 KiB

After

Width:  |  Height:  |  Size: 418 KiB

View File

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/img/favicon/mstile-70x70.png"/>
<square150x150logo src="/img/favicon/mstile-150x150.png"/>
<square310x310logo src="/img/favicon/mstile-310x310.png"/>
<TileColor>#2b5797</TileColor>
</tile>
</msapplication>
</browserconfig>

View File

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View File

@ -7,9 +7,9 @@ function createCourse($dname, $nameId, $points, $disabled) {
} }
echo " echo "
<div style='display:flex;'> <div style='display:flex;'>
<li class='mdl-list__item mdl-list__item--two-line' style='overflow:visible;padding: 16px 24px 16px 16px;width:175px'> <li id='$nameId' class='mdl-list__item mdl-list__item--two-line' style='overflow:visible;padding: 16px 24px 16px 16px;width:175px'>
<span class='mdl-list__item-primary-content'> <span class='mdl-list__item-primary-content'>
<span id='$nameId'>$dname</span> <span>$dname</span>
<span class='points mdl-list__item-sub-title' value=''+points+''>$points Poäng</span> <span class='points mdl-list__item-sub-title' value=''+points+''>$points Poäng</span>
</span> </span>
</li> </li>

29
src/include/extraKurs.php Normal file
View File

@ -0,0 +1,29 @@
<?php
echo "
<form id='programmes' name='programmes'>
<form class='courses kurser'>
<div class='sample_row' style='display:none;'>
<!--SAMPLE ROW-->
<div style='display:flex;'>
<li class='mdl-list__item mdl-list__item--two-line' style='overflow:visible;padding: 16px 24px 16px 16px;width:175px'>
<span class='mdl-list__item-primary-content'>
<input class='mdl-list__item-primary-content' style='margin:-4px 0 6px; height:24px;' type='text' value='Extra Kurs'>
<span class='points mdl-list__item-sub-title'>Poäng:</span>
</span>
</li>
<input class='points mdl-list__item-sub-title' style='width:30px; height:24px; margin:40px 32px 16px -62px;-moz-appearance: textfield;' type='number' value='100'>
<select class='grade'>
<option value='0'>F</option>
<option selected value='10'>E</option>
<option value='12.5'>D</option>
<option value='15'>C</option>
<option value='17.5'>B</option>
<option value='20'>A</option>
</select>
<a class='delete_row mdl-button mdl-js-button mdl-button--accent mdl-js-ripple-effect' style='margin:16px 5px'>Ta Bort</a>
</div>
</div>
</form>
</form>
";

53
src/include/html_head.php Normal file
View File

@ -0,0 +1,53 @@
<?php
echo '
<meta http-equiv="content-language" content="sv-SE">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<meta name="description" content="Beräkna ditt meritvärde inför univeritet eller högskola">
<meta name="author" content="Felix Schulze">
<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
<meta property="og:type" content="website">
<meta property="og:site_name" content="Meritkollen">
<meta property="og:title" content="Räkna ut meritvärde">
<meta property="og:url" content="https://meritkollen.se">
<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
<meta name="title" content="Räkna ut ditt meritvärde">
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
<link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
<link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>
<script async src="/js/modernizer-webp.js"></script>
<link disabled class="lateLoader" rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<link rel="stylesheet" async href="/css/main.css">
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
<![endif]-->
<!--
XXXXXXX
FAVICON
XXXXXXX
-->
<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="/img/favicon/manifest.json">
<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="/img/favicon/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
<meta name="application-name" content="Meritv&auml;rde">
<meta name="msapplication-TileColor" content="#2b5797">
<meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144.png">
<meta name="msapplication-config" content="/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#27233a">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
';

View File

@ -0,0 +1,26 @@
<?php
echo "
<script src='/js/jquery.js'></script>
<script src='/js/material.js'></script>
<script src='/js/materialize.js'></script>
<script defer src='/js/calcscript.js'></script>
<script defer src='/js/changeall.js'></script>
<script defer src='/js/sparabetyg.js'></script>
<script defer src='/js/smallScript.js'></script>
<script defer>
$(document).ready(function() {
laddaBetyg();
$('select').material_select();
});
function updateGrade() {
$('select').material_select('destroy');
window.setTimeout(partB,0);
}
function partB(){
$(document).ready(function() {
$('select').material_select();
});
}
</script>
";

46
html/index.html → src/index.html Executable file → Normal file
View File

@ -2,28 +2,29 @@
<html lang="sv-SE"> <html lang="sv-SE">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Meritkalkylator</title> <title>Meritkollen - Den enkla meritkalkylatorn</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<meta http-equiv="content-language" content="sv-SE"> <meta http-equiv="content-language" content="sv-SE">
<meta name="description" content="Räkna ut ditt meritvärde inför högskolan eller universitet. Med våran meritkalkylator får du enkelt fram ditt jämförelsetal. Gjord för gymnasieelever med A-F betygsskalan"> <meta name="description" content="Räkna ut ditt meritvärde. Med våran meritkalkylator får du enkelt fram ditt jämförelsetal inför högskolan eller universitet.">
<meta name="keywords" content="meriträknare, snittpoäng, meritkollen, meritkalkylator, Räkna ut meritvärde, a-f, kurs, antagning, merit kalkylator, högskola, universitet"> <meta name="keywords" content="meriträknare, snittpoäng, meritkollen, meritkalkylator, Räkna ut meritvärde, a-f, kurs, antagning, merit kalkylator, högskola, universitet">
<meta name="author" content="Felix Schulze"> <meta name="author" content="Felix Schulze">
<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public"> <meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
<link rel="canonical" href="https://meritkollen.se">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:site_name" content="meritkollen.se"> <meta property="og:site_name" content="Meritkollen">
<meta property="og:title" content="Räkna ut meritvärde"> <meta property="og:title" content="Räkna ut meritvärde">
<meta property="og:url" content="https://meritkollen.se">
<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola"> <meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
<meta name="title" content="Räkna ut ditt meritvärde"> <meta name="title" content="Räkna ut ditt meritvärde">
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin> <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin> <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src="assets/js/modernizer-webp.js"></script> <script async src="/js/modernizer-webp.js"></script>
<link rel="stylesheet" async href="assets/css/main.min.css"> <link rel="stylesheet" async href="/css/main.css">
<link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'>
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@ -37,32 +38,35 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link href="assets/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180"> <link href="/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
<link href="assets/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png"> <link href="/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
<link href="assets/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"> <link href="/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
<link href="assets/img/favicon/manifest.json" rel="manifest"> <link href="/img/favicon/manifest.json" rel="manifest">
<link color="#2b5797" href="assets/img/favicon/safari-pinned-tab.svg" rel="mask-icon"> <link color="#2b5797" href="/img/favicon/safari-pinned-tab.svg" rel="mask-icon">
<link href="assets/img/favicon/favicon.ico" rel="shortcut icon"> <link href="/img/favicon/favicon.ico" rel="shortcut icon">
<meta content="Meritv&auml;rde" name="apple-mobile-web-app-title"> <meta content="Meritv&auml;rde" name="apple-mobile-web-app-title">
<meta content="Meritv&auml;rde" name="application-name"> <meta content="Meritv&auml;rde" name="application-name">
<meta content="#2b5797" name="msapplication-TileColor"> <meta content="#2b5797" name="msapplication-TileColor">
<meta content="assets/img/favicon/mstile-144x144.png" name="msapplication-TileImage"> <meta content="/img/favicon/mstile-144x144.png" name="msapplication-TileImage">
<meta content="assets/img/favicon/browserconfig.xml" name="msapplication-config"> <meta content="/img/favicon/browserconfig.xml" name="msapplication-config">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
</head> </head>
<body id="bg"> <body id="bg">
<!-- <!--
XXXXXX XXXXXX
HEADER HEADER
XXXXXX XXXXXX
--> -->
<header class="parallaxHeader textCenter" id="pageContent"> <header class="parallaxHeader textCenter" id="pageContent">
<h1 id="bannerTitle" class="animate-bottom">Meritkollen</h1><!-- <h1 class="bannerTitle animate-bottom">Meritkollen</h1>
<h5 class="bannerTitle animate-bottom" style="background-color:unset;">Den enkla meritkalkylatorn</h5>
<!--
XXXX XXXX
BODY BODY
XXXX XXXX
@ -134,9 +138,9 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
</div> </div>
</header> </header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="/js/jquery.js"></script>
<script defer src="assets/js/material.min.js"></script> <script defer src="/js/material.js"></script>
<script defer src="assets/js/softscrollscript.js"></script> <script defer src="/js/softscrollscript.js"></script>
<script defer src="assets/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

View File

@ -1,21 +1,3 @@
/*
*
* Air Horner
* Copyright 2015 Google Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*
*/
if (!Cache.prototype.add) { if (!Cache.prototype.add) {
Cache.prototype.add = function add(request) { Cache.prototype.add = function add(request) {
return this.addAll([request]); return this.addAll([request]);

View File

@ -2,11 +2,11 @@ $(document).ready(function() {
$('form').change(function() { $('form').change(function() {
raknaUtMeritvarde(); raknaUtMeritvarde();
}); });
$('.add_row').live('click', function() { $(document).on('click','.add_row', function() {
$('div.sample_row > div').clone().appendTo('form.courses'); $('div.sample_row > div').clone().appendTo('form.courses');
raknaUtMeritvarde(); raknaUtMeritvarde();
}); });
$('.delete_row').live('click', function() { $(document).on('click','.delete_row', function() {
$(this).parent().slideUp(function() { $(this).parent().slideUp(function() {
$(this).remove(); $(this).remove();
raknaUtMeritvarde(); raknaUtMeritvarde();

10598
src/js/jquery.js vendored Normal file

File diff suppressed because it is too large Load Diff

3996
src/js/material.js Normal file

File diff suppressed because it is too large Load Diff

10
src/js/materialize.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -4,6 +4,6 @@ if('serviceWorker' in navigator) {
}); });
} }
window.addEventListener('load', function() { $(function() {
$(".lateLoader").prop('disabled', false); $(".lateLoader").prop('disabled', false);
}); });

View File

@ -1,8 +1,4 @@
// JavaScript Document // JavaScript Document
$('.sparaBetyg').on('click', function() {
sparaBetyg();
console.log("lol")
});
function sparaBetyg() { function sparaBetyg() {
var urlLink = "?"; var urlLink = "?";
$('form.kurser').find('div').each(function(){ $('form.kurser').find('div').each(function(){
@ -16,7 +12,7 @@ function sparaBetyg() {
urlLink = "https://" + window.location.hostname + window.location.pathname + urlLink; urlLink = "https://" + window.location.hostname + window.location.pathname + urlLink;
$('.link_span').remove(); $('.link_span').remove();
$('.score_span').append('<span class="link_span"><div class="demo-card-square mdl-card mdl-shadow--16dp" style="text-align:left;width:260px; height:auto;margin:50px auto 0;"><div class="mdl-card__title"><h2 class="mdl-card__title-text" style="font-size:28px;">Spara</h2></div><div class="mdl-card__supporting-text">Spara Länken som bokmärke för att kunna återvända till dina betyg</div><div class="mdl-card__actions mdl-card--border" style="padding: 4px 16px 8px;"><div style="padding:0; width:125px;" class="mdl-textfield mdl-js-textfield"><input readonly style="margin: 0 0 8px 0; border-bottom: 1px solid #26a69a; box-shadow: 0 1px 0 0 #26a69a;" class="mdl-textfield__input betygLink" id="betygLink" type="text" value="'+ urlLink +'" onClick="betygSelect()"><label class="mdl-textfield__label" for="betygLink"></label></div><i class="material-icons mdl-button--primary" onClick="copyLink()" style="margin:12px 16px; cursor: pointer; position: absolute; right:0;">content_copy</i></div></div></span>'); $('.score_span').append('<span class="link_span"><div class="demo-card-square mdl-card mdl-shadow--16dp" style="text-align:left;width:260px; height:auto;margin:50px auto 0;"><div class="mdl-card__title"><h2 class="mdl-card__title-text" style="font-size:28px;">Spara</h2></div><div style="min-height:81px;" class="mdl-card__supporting-text">Spara Länken som bokmärke för att kunna återvända till dina betyg</div><div class="mdl-card__actions mdl-card--border"><a class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary" onClick="copyLink()" style="padding: 0 12px;min-width: unset;"><i class="material-icons mdl-button--primary">content_copy</i></a><div style="padding:0 12px; width:auto;" class="mdl-textfield mdl-js-textfield"><input readonly style="margin:0; height:24px; border-bottom: 1px solid #26a69a; box-shadow: 0 1px 0 0 #26a69a;" class="mdl-textfield__input betygLink" id="betygLink" type="text" value="'+ urlLink +'" onClick="betygSelect()"><label class="mdl-textfield__label" for="betygLink"></label></div></div></div></span>');
betygSelect(); betygSelect();
} }
function betygSelect() { function betygSelect() {

8
src/robots.txt Normal file
View File

@ -0,0 +1,8 @@
User-agent: *
Disallow: /assets/
Disallow: /include/
Disallow: /404.html
Disallow: /50x.html
Disallow: /sw.js
Disallow: /cache-polyfill.js
Disallow: /ads.txt

View File

@ -1,7 +1,8 @@
importScripts('/cache-polyfill.js'); importScripts('/js/cache-polyfill.js');
self.addEventListener('install', function(e) { self.addEventListener('install', function(e) {
self.skipWaiting();
e.waitUntil( e.waitUntil(
caches.open('meritkollen').then(function(cache) { caches.open('meritkollen').then(function(cache) {
return cache.addAll([ return cache.addAll([
@ -13,25 +14,25 @@ self.addEventListener('install', function(e) {
'/Samhäll', '/Samhäll',
'/Teknik', '/Teknik',
'/Kontakt', '/Kontakt',
'/assets/css/main.min.css', '/css/main.css',
'/assets/img/tips.jpg ', '/img/background.jpg',
'/assets/img/background.jpg ', '/img/background85.webp',
'/assets/img/background85.webp ', '/img/favicon/manifest.json',
'/assets/img/favicon/manifest.json', '/img/favicon/android-chrome-192x192.png',
'/assets/img/favicon/android-chrome-192x192.png', '/img/favicon/favicon-32x32.png',
'/assets/img/favicon/favicon-32x32.png', '/img/favicon/favicon-16x16.png',
'/assets/img/favicon/favicon-16x16.png', '/img/favicon/favicon.ico',
'/assets/img/favicon/favicon.ico', '/js/calcscript.js',
'/assets/js/softscrollscript.js', '/js/changeall.js',
'/assets/js/loader.min.js', '/js/jquery.js',
'/assets/js/material.min.js', '/js/material.js',
'/assets/js/smallScript.js', '/js/materialize.js',
'/assets/js/modernizer-webp.js', '/js/modernizer-webp.js',
'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js', '/js/smallScript.js',
'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', '/js/softscrollscript.js',
'/js/sparabetyg.js',
'https://fonts.googleapis.com/icon?family=Material+Icons', 'https://fonts.googleapis.com/icon?family=Material+Icons',
'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2', 'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2',
'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700',
'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2', 'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2',
'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff', 'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff',
'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Medium.woff2', 'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Medium.woff2',