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

Merge #2

Merged
merged 15 commits into from
Dec 28, 2020
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
7 changes: 5 additions & 2 deletions .github/workflows/test.yml → .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ jobs:

steps:
- uses: actions/checkout@v2

# Use GitHub Actions' cache to shorten build times and decrease load on servers.
- uses: actions/cache@v1
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-


- name: Copy post for og-images
run: cp _posts/* _og-images/

- uses: helaili/[email protected]
env:
# Ideally use GITHUB_TOKEN but it gives error for this action.
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ group :jekyll_plugins do
gem 'jekyll-feed'
gem 'jekyll-sitemap'
gem 'jekyll-paginate-v2'
gem 'jekyll-seo-tag'
gem 'jekyll-datapage-generator'
end
5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.14.1)
ffi (1.14.2)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.5)
Expand All @@ -36,8 +36,6 @@ GEM
jekyll (>= 3.0, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.7.1)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
Expand Down Expand Up @@ -74,7 +72,6 @@ DEPENDENCIES
jekyll-datapage-generator
jekyll-feed
jekyll-paginate-v2
jekyll-seo-tag
jekyll-sitemap

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ autopages:
categories:
layouts:
- 'autopage_categories.html'
title: 'Wszystkie strony z tagiem :cat' # :tag is replaced by the tag name
title: 'Wszystkie strony w kategorii :cat' # :tag is replaced by the tag name
permalink: '/category/:cat'
slugify:
mode: 'default' # :tag is slugified.
Expand Down
2 changes: 1 addition & 1 deletion _data/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ aryll:
image: https://github.com/aryll.png?size=200
name: "Agnieszka Cent"
bio: >
To jakieś bio
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

maciejgos:
github: maciejgos
Expand Down
6 changes: 0 additions & 6 deletions _includes/custom-head.html

This file was deleted.

31 changes: 25 additions & 6 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
<!-- meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% if page.title %}
<title>{{ page.title }}</title>
{% else %}
<title>{{ site.title }}</title>
{% endif %}

{% if page.description %}
<meta content="{{ page.description }}" name="description">
{% else %}
<meta content="{{ site.description }}" name="description">
{% endif %}

<!-- SEO -->
{% seo %}
{%- include meta-og.html -%}
<!-- SEO -->

<!-- Twitter card -->
{%- include twitter-card.html -%}
<!-- Twitter card -->

<!-- Favicon Icon -->
<link rel="shortcut icon" href="/assets/images/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">

<!-- inject css start -->

Expand All @@ -17,7 +38,5 @@
<!-- inject css end -->

{%- if jekyll.environment == 'production' and site.google_analytics -%}
{%- include google-analytics.html -%}
{%- endif -%}

{%- include custom-head.html -%}
{%- include google-tag.html -%}
{%- endif -%}
36 changes: 36 additions & 0 deletions _includes/meta-og.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<meta content="{{ site.title }}" property="og:site_name">
{% if page.title %}
<meta content="{{ page.title }}" property="og:title">
{% else %}
<meta content="{{ site.title }}" property="og:title">
{% endif %}
{% if page.title %}
<meta content="article" property="og:type">
{% else %}
<meta content="website" property="og:type">
{% endif %}
{% if page.description %}
<meta content="{{ page.description }}" property="og:description">
{% else %}
<meta content="{{ site.description }}" property="og:description">
{% endif %}
{% if page.url %}
<meta content="{{ site.url }}{{ page.url }}" property="og:url">
{% endif %}
{% if page.date %}
<meta content="{{ page.date | date_to_xmlschema }}" property="article:published_time">
<meta content="{{ site.url }}/about/" property="article:author">
{% endif %}

<meta content="https://image.thum.io/get/ogImage/{{ site.url }}/og-image/{{ page.slug }}" property="og:image">

{% if page.categories %}
{% for category in page.categories limit:1 %}
<meta content="{{ category }}" property="article:section">
{% endfor %}
{% endif %}
{% if page.tags %}
{% for tag in page.tags %}
<meta content="{{ tag }}" property="article:tag">
{% endfor %}
{% endif %}
23 changes: 23 additions & 0 deletions _includes/twitter-card.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<meta name="twitter:site" content="@{{ site.twitter.username }}">
{% assign author = page.author[0] %}
{% if site.data.authors[author].twitter %}
<meta name="twitter:creator" content="@{{ site.data.authors[author].twitter }}">
{% else %}
<meta name="twitter:creator" content="@{{ twitter.username }}">
{% endif %}

<meta name="twitter:title" content="{{ page.title }}">

{% if page.summary %}
<meta name="twitter:description" content="{{ page.summary }}">
{% else %}
<meta name="twitter:description" content="{{ site.description }}">
{% endif %}

{% if page.image %}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image" content="{{ site.url }}{{ page.image }}">
{% else %}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image" content="https://image.thum.io/get/ogImage/{{ site.url }}/og-image/{{ page.slug }}">
{% endif %}
4 changes: 2 additions & 2 deletions _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1 class="text-white">{{ page.title | escape }}</h1>
{%- if page.image -%}
<img class="card-img-top shadow" src="{{ page.image }}" alt="Image">
{% endif %}
<div class="card-body pt-5 px-0">
<div class="card-body post pt-5 px-0">
<div>
<div class="d-inline-block bg-light text-center px-2 py-1 rounded mr-2"><span class="text-primary">{{
page.date | date: "%-d" }}</span>
Expand Down Expand Up @@ -96,7 +96,7 @@ <h2>
{% assign person = site.data.authors[author] %}
<div class="d-block d-md-flex my-5">
<div class="mr-md-4 mb-4 mb-md-0">
<img class="img-fluid rounded-circle" alt="image" src="{{ person.image }}">
<img class="img-fluid rounded-circle img-author" alt="image" src="{{ person.image }}">
</div>
<div>
<div class="d-flex justify-content-between align-items-center border-bottom pb-3 mb-3">
Expand Down
16 changes: 7 additions & 9 deletions _posts/2020-07-02-azure-solutions-architect-qa-review-session.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
---
title: "Przegląd zaproponowanych rozwiązań"
title: "#azure-solutions-architect Przegląd zaproponowanych rozwiązań"
categories:
- "Architecture Meetings"
tags:
- "Review sessions"
author:
- kaluzaaa
---

# #azure-solutions-architect Review proposed solutions

[Add to calendar](https://evt.mx/KuVfnCVp)

[Meeting link](https://teams.microsoft.com/l/meetup-join/19%3ameeting_MGNjMTU5MTktN2QxMi00YTRhLThkYmUtYzZkZTM0MGUyYjY5%40thread.v2/0?context=%7b%22Tid%22%3a%22cc58971a-0481-4ec0-bf8d-bb2e265db003%22%2c%22Oid%22%3a%22f907c950-2a9a-4012-b163-af67be63b5d6%22%7d)

[Recording](https://youtu.be/2H8VoSQAw1c)

# Agenda
## Agenda

1. Review przygotowany rozwiązań.
2. Jak przygotowany projekt przełożyć na stawiane przez biznes SLA.
3. Jak dobrze przełożyć [Overview of the reliability pillar](https://docs.microsoft.com/en-us/azure/architecture/framework/resiliency/overview) na nasz projekt architektury?
4. Q&A.

# Discussion
## Discussion

## Review projektu architektury
### Review projektu architektury

Zadanie dla was to zaprojektować usługę, do której będą trafiać zdjęcia współdzielone przez kilka systemów.

Expand All @@ -43,7 +40,7 @@ Założenia:
- Ile będzie kosztować system na przestrzeni 1, 12 i 24 miesięcy?

### Poglądowy schemat architektury:
![Schemat architektury](../assets/images/posts/2020-07-02/architektura02072020.jpg)
![Schemat architektury](/assets/images/posts/2020-07-02/architektura02072020.jpg)

### Opis
- `Azure Blob Storage` geo-redundant
Expand Down Expand Up @@ -72,7 +69,8 @@ Zalety architektury: można napisać w tydzień i puścić na produkcję
Wady architektury: regiony są sparowane - żeby nie być zmuszonym do parowania regionów trzeba napisać kod do replikacji na event gridze lub azure function


## Q&A
### Q&A

1.Czy CosmosDb może zabić kosztami?

CosmosDb karze głupotę. Sprawdza się przy średnich i dużych rozwiązaniach (np. replikacja danych między regionami)
Expand Down
Binary file added android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android-chrome-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/css/spacing.css
Original file line number Diff line number Diff line change
Expand Up @@ -3326,6 +3326,6 @@
.custom-pb-3 { padding-bottom: 20rem !important; }
.custom-pb-4 { padding-bottom: 25rem !important; }
.custom-pb-5 { padding-bottom: 30rem !important; }
.z-index-1 { z-index: 99; position: relative;}
.z-index-1 { z-index: 9; position: relative;}
.mt-n15 { margin-top: -15rem !important; }
.mt-n20 { margin-top: -20rem !important; }
9 changes: 9 additions & 0 deletions assets/css/style.min.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,13 @@
pointer-events: none;
cursor: default;
}
}

.img-author {
max-width: 100px;
}

.post img {
max-width: 100%;
height: auto;
}
14 changes: 7 additions & 7 deletions assets/css/theme-plugin.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
7. Spacing
------------------------ */

@import 'bootstrap-own.min.css';
@import 'animate.css';
@import 'line-awesome.min.css';
@import 'magnific-popup.css';
@import 'owl.carousel.css';
@import 'lightslider.min.css';
@import 'spacing.css';
@import '/assets/css/bootstrap-own.min.css';
@import '/assets/css/animate.css';
@import '/assets/css/line-awesome.min.css';
@import '/assets/css/magnific-popup.css';
@import '/assets/css/owl.carousel.css';
@import '/assets/css/lightslider.min.css';
@import '/assets/css/spacing.css';
1 change: 1 addition & 0 deletions assets/scss/theme.min.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ body {

a {
text-decoration: none;
color: $text-primary;

&:hover {
color: $text-primary;
Expand Down
9 changes: 9 additions & 0 deletions browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
7 changes: 6 additions & 1 deletion docs/Documentation/Documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,13 @@ <h3>Change Log
</h3>
</div>
<div>
<h4>Initial Release
<h4>Version 1.1
</h4>
<p>- Update - theme.min.css File
<br>- Update - spacing.css File
<br>- Update - login-2.html
<br>- Update - forgot-password.html
<br>- Update - Sass File</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/Template/html/assets/css/spacing.css
Original file line number Diff line number Diff line change
Expand Up @@ -3326,6 +3326,6 @@
.custom-pb-3 { padding-bottom: 20rem !important; }
.custom-pb-4 { padding-bottom: 25rem !important; }
.custom-pb-5 { padding-bottom: 30rem !important; }
.z-index-1 { z-index: 99; position: relative;}
.z-index-1 { z-index: 9; position: relative;}
.mt-n15 { margin-top: -15rem !important; }
.mt-n20 { margin-top: -20rem !important; }
1 change: 1 addition & 0 deletions docs/Template/html/assets/css/theme.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ body {

a {
text-decoration: none;
color: #01a479;
}

a:hover {
Expand Down
2 changes: 1 addition & 1 deletion docs/Template/html/forgot-password.html
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ <h1 class="text-white">Forgot Password</h1>
<section>
<div class="container">
<div class="row justify-content-center text-center">
<div class="col-5">
<div class="col-lg-5">
<div>
<div class="mb-5">
<h2>Forgot your password?</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/Template/html/login-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ <h1 class="text-white">Login Two</h1>
<section>
<div class="container">
<div class="row justify-content-center">
<div class="col-5">
<div class="col-lg-5">
<div class="bg-white shadow rounded p-4">
<h2 class="text-center mb-3">Sign In</h2>
<form id="contact-form" method="post" action="php/contact.php">
Expand Down
2 changes: 1 addition & 1 deletion docs/Template/rtl/assets/css/spacing.css
Original file line number Diff line number Diff line change
Expand Up @@ -3326,6 +3326,6 @@
.custom-pb-3 { padding-bottom: 20rem !important; }
.custom-pb-4 { padding-bottom: 25rem !important; }
.custom-pb-5 { padding-bottom: 30rem !important; }
.z-index-1 { z-index: 99; position: relative;}
.z-index-1 { z-index: 9; position: relative;}
.mt-n15 { margin-top: -15rem !important; }
.mt-n20 { margin-top: -20rem !important; }
1 change: 1 addition & 0 deletions docs/Template/rtl/assets/css/theme.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ body {

a {
text-decoration: none;
color: #01a479;
}

a:hover {
Expand Down
Loading